diff --git a/app/views/social_links/_show.html.erb b/app/views/social_links/_show.html.erb
new file mode 100644
index 0000000000..b2dc94a7b1
--- /dev/null
+++ b/app/views/social_links/_show.html.erb
@@ -0,0 +1,14 @@
+
+ <% social_links.each do |social_link| %>
+ -
+ <%= link_to social_link.url, :class => "icon-link mw-100 text-body-secondary mb-3", :rel => "nofollow me" do %>
+ <%= image_tag "social_link_icons/#{social_link.parsed[:platform].nil? ? 'other' : social_link.parsed[:platform]}.svg",
+ :alt => social_link.parsed[:platform].nil? ? t(".other") : social_link.parsed[:platform],
+ :size => "16" %>
+
+ <%= social_link.parsed[:name] %>
+
+ <% end %>
+
+ <% end %>
+
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index a32f5fae1e..5ffb7c61d2 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -231,10 +231,17 @@
- <%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %>
+
+
+ <%= render "social_links/show",
+ :social_links => @user.social_links %>
-<% end %>
+
+
<%= @user.description.to_html %>
+ <% if current_user and @user.id == current_user.id %>
+
+ <%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %>
+
+ <% end %>
+
+
diff --git a/config/i18n-js.yml b/config/i18n-js.yml
index b7f3b4dbcb..4d83f369a2 100644
--- a/config/i18n-js.yml
+++ b/config/i18n-js.yml
@@ -14,6 +14,7 @@ translations:
- "*.diary_entries.edit.marker_text"
- "*.layouts.project_name.title"
- "*.geocoder.search_osm_nominatim.*"
+ - "*.profiles.edit.social_links.remove"
- file: "app/assets/javascripts/i18n/embed.js"
pretty_print: true
only:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 42669ca9e3..76c25555ad 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -37,6 +37,10 @@ en:
messages:
display_name_is_user_n: can't be user_n unless n is your user id
models:
+ social_link:
+ attributes:
+ url:
+ http_parse_error: Url should start with http:// or https://
user_mute:
attributes:
subject:
@@ -1917,6 +1921,10 @@ en:
show: "Show"
delete: "Delete"
undelete: "Undo delete"
+ social_links:
+ title: Social Profile Links
+ remove: Remove
+ add: Add Social Link
update:
success: Profile updated.
failure: Couldn't update profile.
@@ -2549,6 +2557,9 @@ en:
community group. Anyone can set up or join these. Read more on the %{communities_wiki_link}.
communities_wiki: Communities wiki page
communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group
+ social_links:
+ show:
+ other: Other
traces:
visibility:
private: "Private (only shared as anonymous, unordered points)"
diff --git a/db/migrate/20250217140049_create_social_links.rb b/db/migrate/20250217140049_create_social_links.rb
new file mode 100644
index 0000000000..65a527aae9
--- /dev/null
+++ b/db/migrate/20250217140049_create_social_links.rb
@@ -0,0 +1,10 @@
+class CreateSocialLinks < ActiveRecord::Migration[7.2]
+ def change
+ create_table :social_links do |t|
+ t.references :user, :null => false, :foreign_key => true
+ t.string :url, :null => false
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index d23c2d7487..5ca7b08fdc 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1361,6 +1361,38 @@ CREATE TABLE public.schema_migrations (
);
+--
+-- Name: social_links; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.social_links (
+ id bigint NOT NULL,
+ user_id bigint NOT NULL,
+ url character varying NOT NULL,
+ created_at timestamp(6) without time zone NOT NULL,
+ updated_at timestamp(6) without time zone NOT NULL
+);
+
+
+--
+-- Name: social_links_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.social_links_id_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+
+--
+-- Name: social_links_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.social_links_id_seq OWNED BY public.social_links.id;
+
+
--
-- Name: user_blocks; Type: TABLE; Schema: public; Owner: -
--
@@ -1755,6 +1787,13 @@ ALTER TABLE ONLY public.redactions ALTER COLUMN id SET DEFAULT nextval('public.r
ALTER TABLE ONLY public.reports ALTER COLUMN id SET DEFAULT nextval('public.reports_id_seq'::regclass);
+--
+-- Name: social_links id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.social_links ALTER COLUMN id SET DEFAULT nextval('public.social_links_id_seq'::regclass);
+
+
--
-- Name: user_blocks id; Type: DEFAULT; Schema: public; Owner: -
--
@@ -2119,6 +2158,14 @@ ALTER TABLE ONLY public.schema_migrations
ADD CONSTRAINT schema_migrations_pkey PRIMARY KEY (version);
+--
+-- Name: social_links social_links_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.social_links
+ ADD CONSTRAINT social_links_pkey PRIMARY KEY (id);
+
+
--
-- Name: user_blocks user_blocks_pkey; Type: CONSTRAINT; Schema: public; Owner: -
--
@@ -2631,6 +2678,13 @@ CREATE INDEX index_reports_on_issue_id ON public.reports USING btree (issue_id);
CREATE INDEX index_reports_on_user_id ON public.reports USING btree (user_id);
+--
+-- Name: index_social_links_on_user_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_social_links_on_user_id ON public.social_links USING btree (user_id);
+
+
--
-- Name: index_user_blocks_on_creator_id_and_id; Type: INDEX; Schema: public; Owner: -
--
@@ -3026,6 +3080,14 @@ ALTER TABLE ONLY public.user_mutes
ADD CONSTRAINT fk_rails_591dad3359 FOREIGN KEY (owner_id) REFERENCES public.users(id);
+--
+-- Name: social_links fk_rails_6034fd4f62; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.social_links
+ ADD CONSTRAINT fk_rails_6034fd4f62 FOREIGN KEY (user_id) REFERENCES public.users(id);
+
+
--
-- Name: oauth_access_tokens fk_rails_732cb83ab7; Type: FK CONSTRAINT; Schema: public; Owner: -
--
@@ -3429,6 +3491,7 @@ INSERT INTO "schema_migrations" (version) VALUES
('23'),
('22'),
('21'),
+('20250217140049'),
('20250206202905'),
('20250121191749'),
('20250105154621'),
diff --git a/test/controllers/profiles_controller_test.rb b/test/controllers/profiles_controller_test.rb
index f388349ab3..b5ea4b54ab 100644
--- a/test/controllers/profiles_controller_test.rb
+++ b/test/controllers/profiles_controller_test.rb
@@ -59,5 +59,14 @@ def test_update
get edit_profile_path
assert_select "form > fieldset > div > div.col-sm-10 > div > input[name=avatar_action][checked]", false
assert_select "form > fieldset > div > div.col-sm-10 > div > div.form-check > input[name=avatar_action][checked]", false
+
+ # Updating social links should work
+ put profile_path, :params => { :user => { :description => user.description, :social_links_attributes => [{ :url => "https://test.com/test" }] } }
+ assert_redirected_to user_path(user)
+ follow_redirect!
+ assert_response :success
+ assert_template :show
+ assert_select ".alert-success", /^Profile updated./
+ assert_select "a", "test.com/test"
end
end
diff --git a/test/factories/social_link.rb b/test/factories/social_link.rb
new file mode 100644
index 0000000000..fb6f7f6e1b
--- /dev/null
+++ b/test/factories/social_link.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+ factory :social_link do
+ sequence(:url) { |n| "https://test.com/#{n}" }
+ user
+ end
+end
diff --git a/test/models/social_link_test.rb b/test/models/social_link_test.rb
new file mode 100644
index 0000000000..2176f342ba
--- /dev/null
+++ b/test/models/social_link_test.rb
@@ -0,0 +1,57 @@
+require "test_helper"
+
+class SocialLinkTest < ActiveSupport::TestCase
+ def test_user_required
+ social_link = create(:social_link)
+
+ assert_predicate social_link, :valid?
+ social_link.user = nil
+ assert_not_predicate social_link, :valid?
+ end
+
+ def test_url_required
+ social_link = create(:social_link)
+
+ assert_predicate social_link, :valid?
+ social_link.url = nil
+ assert_not_predicate social_link, :valid?
+ end
+
+ def test_url_https_valid
+ social_link = create(:social_link)
+
+ assert_predicate social_link, :valid?
+ social_link.url = "test"
+ assert_not_predicate social_link, :valid?
+ end
+
+ def test_parsed_platform
+ social_link = create(:social_link, :url => "https://mastodon.social/@test")
+
+ assert_equal "mastodon", social_link.parsed[:platform]
+ assert_equal "test", social_link.parsed[:name]
+ end
+
+ def test_parsed_platform_with_www
+ social_link = create(:social_link, :url => "http://www.mastodon.social/@test")
+
+ assert_equal "mastodon", social_link.parsed[:platform]
+ assert_equal "test", social_link.parsed[:name]
+ end
+
+ def test_parsed_platform_custom_name
+ social_link = create(:social_link, :url => "https://discord.com/users/0")
+
+ assert_equal "discord", social_link.parsed[:platform]
+ assert_equal "Discord", social_link.parsed[:name]
+ end
+
+ def test_parsed_platform_other
+ url = "https://test.com/test"
+ expected = "test.com/test"
+ social_link = create(:social_link, :url => url)
+
+ assert_nil social_link.parsed[:platform]
+ assert_equal social_link.parsed[:name], expected
+ end
+end