API for updating attribution domains #32730

c960657 · 2024-10-31T21:08:52Z

Add API support for updating attribution domains.

This moves the existing validation and normalization from the dynamic attribute (..._as_text) to the “real” database attribute, so it is shared with the API. The text↔array conversion is not used by the API, so this is moved to the controller for the settings page.

This feature may be useful e.g. for online newspapers that want to update the setting for all staff writers.

Documentation PR: mastodon/documentation#1558

…-api

mjankowski

If for whatever reason we don't want the API change here, we should pull out the normalization/validation changes and do those.

github-actions · 2024-11-04T09:17:47Z

This pull request has merge conflicts that must be resolved before it can be merged.

# Conflicts: # config/locales/simple_form.nl.yml

github-actions · 2024-11-04T22:02:56Z

This pull request has resolved merge conflicts and is ready for review.

github-actions · 2024-11-13T10:11:27Z

This pull request has merge conflicts that must be resolved before it can be merged.

# Conflicts: # config/locales/simple_form.nl.yml

github-actions · 2024-11-13T17:02:56Z

This pull request has resolved merge conflicts and is ready for review.

github-actions · 2024-11-15T11:11:02Z

This pull request has merge conflicts that must be resolved before it can be merged.

ClearlyClaire · 2024-11-15T14:18:14Z

Is too_many_lines still used at all? I can't see any sign of it being used, and indeed, trying to add more domains than the maximum, I get the following:

Validation failed: Attribution domains is too long (maximum is 100 characters) (ActiveRecord::RecordInvalid)

# Conflicts: # app/views/settings/verifications/show.html.haml # config/locales/simple_form.cy.yml

c960657 · 2024-11-17T13:02:42Z

Is too_many_lines still used at all?

No, good catch. I have removed it now.

github-actions · 2024-12-20T17:03:01Z

This pull request has resolved merge conflicts and is ready for review.

github-actions · 2025-01-04T20:07:06Z

This pull request has merge conflicts that must be resolved before it can be merged.

# Conflicts: # spec/models/account_spec.rb

github-actions · 2025-01-04T21:02:54Z

This pull request has resolved merge conflicts and is ready for review.

ClearlyClaire

This looks ok to me, but I'd like to have another pair of eyes on it.

The added request specs should most probably be system specs instead.

There is already a documentation PR (mastodon/documentation#1558) but it may also warrant an API version bump (see Mastodon::Version.api_version)

spec/requests/settings/verification_spec.rb

# Conflicts: # spec/models/account_spec.rb

github-actions · 2025-01-08T17:09:06Z

This pull request has resolved merge conflicts and is ready for review.

oneiros

Overall I think this good, thanks a lot.

I did find two more minor problems though. Please have a look at my comments when you have time.

app/serializers/rest/account_serializer.rb

lib/mastodon/version.rb

github-actions · 2025-01-10T10:07:30Z

This pull request has merge conflicts that must be resolved before it can be merged.

# Conflicts: # spec/models/account_spec.rb

github-actions · 2025-01-14T20:03:21Z

This pull request has resolved merge conflicts and is ready for review.

oneiros · 2025-01-15T10:43:24Z

Thank you for taking the time to consider my remarks. This looks good to me now.

The accompanying docs PR (mastodon/documentation#1558) is no longer accurate after the latest changes. Would you be so kind and update that as well? Thanks!

(Oh, and when you do: The first version this will most probably be introduced in will be 4.4.)

c960657 added 6 commits October 30, 2024 18:38

Accept attribution_domains in API

5b18b03

Remove attribution_domains_as_text

dd295a6

Rename attribution_domains_as_text key

82e1a69

Update variable in too_many_lines

6f1c27f

Fix domain validation for acct: true

a3da6fb

Move normalising back into model

ac50f57

c960657 mentioned this pull request Oct 31, 2024

API for updating attribution domains #32726

Closed

c960657 added 2 commits October 31, 2024 23:24

Merge remote-tracking branch 'upstream/main' into attribution-domains…

7974cc9

…-api

Update missing locales

e2cdd89

mjankowski reviewed Nov 1, 2024

View reviewed changes

github-actions bot added the rebase needed 🚧 label Nov 4, 2024

c960657 added 2 commits November 4, 2024 22:22

Merge branch 'main' into attribution-domains-api

884c966

# Conflicts: # config/locales/simple_form.nl.yml

fy

bbe6051

github-actions bot removed the rebase needed 🚧 label Nov 4, 2024

github-actions bot added the rebase needed 🚧 label Nov 13, 2024

Merge branch 'main' into attribution-domains-api

4976702

# Conflicts: # config/locales/simple_form.nl.yml

github-actions bot removed the rebase needed 🚧 label Nov 13, 2024

Expose in account serializer

b0bbb7f

c960657 mentioned this pull request Nov 13, 2024

Add documentation for attribution_domains mastodon/documentation#1558

Merged

github-actions bot added the rebase needed 🚧 label Nov 15, 2024

renchap requested a review from a team November 15, 2024 11:23

c960657 added 2 commits November 16, 2024 23:51

Unused string

284db31

Merge branch 'main' into attribution-domains-api

54d35ca

# Conflicts: # app/views/settings/verifications/show.html.haml # config/locales/simple_form.cy.yml

github-actions bot removed the rebase needed 🚧 label Dec 20, 2024

github-actions bot added the rebase needed 🚧 label Jan 4, 2025

Merge branch 'main' into attribution-domains-api

45d6e3a

# Conflicts: # spec/models/account_spec.rb

github-actions bot added rebase needed 🚧 and removed rebase needed 🚧 labels Jan 4, 2025

ClearlyClaire reviewed Jan 8, 2025

View reviewed changes

spec/requests/settings/verification_spec.rb Outdated Show resolved Hide resolved

c960657 added 2 commits January 8, 2025 17:16

Merge branch 'main' into attribution-domains-api

cc35e03

# Conflicts: # spec/models/account_spec.rb

Bump api_version

ef5f1c2

github-actions bot removed the rebase needed 🚧 label Jan 8, 2025

Convert to system spec

e7f45ee

ClearlyClaire previously approved these changes Jan 9, 2025

View reviewed changes

oneiros requested changes Jan 9, 2025

View reviewed changes

app/serializers/rest/account_serializer.rb Outdated Show resolved Hide resolved

lib/mastodon/version.rb Outdated Show resolved Hide resolved

github-actions bot added the rebase needed 🚧 label Jan 10, 2025

c960657 added 3 commits January 14, 2025 18:26

Wrong change of api_version

6f5f766

Move serialize

68034f2

Merge branch 'main' into attribution-domains-api

89d5146

# Conflicts: # spec/models/account_spec.rb

c960657 dismissed ClearlyClaire’s stale review via 89d5146 January 14, 2025 19:13

github-actions bot removed the rebase needed 🚧 label Jan 14, 2025

oneiros approved these changes Jan 15, 2025

View reviewed changes

oneiros added this pull request to the merge queue Jan 17, 2025

Merged via the queue into mastodon:main with commit a3baae0 Jan 17, 2025
32 checks passed

vmstan pushed a commit to vmstan/mastodon that referenced this pull request Mar 27, 2025

API for updating attribution domains (mastodon#32730)

e0069d7

Uh oh!

API for updating attribution domains #32730

API for updating attribution domains #32730

Uh oh!

Conversation

c960657 commented Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mjankowski left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Nov 4, 2024

Uh oh!

github-actions bot commented Nov 4, 2024

Uh oh!

github-actions bot commented Nov 13, 2024

Uh oh!

github-actions bot commented Nov 13, 2024

Uh oh!

github-actions bot commented Nov 15, 2024

Uh oh!

ClearlyClaire commented Nov 15, 2024

Uh oh!

c960657 commented Nov 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Dec 20, 2024

Uh oh!

github-actions bot commented Jan 4, 2025

Uh oh!

github-actions bot commented Jan 4, 2025

Uh oh!

ClearlyClaire left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Jan 8, 2025

Uh oh!

oneiros left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 10, 2025

Uh oh!

github-actions bot commented Jan 14, 2025

Uh oh!

oneiros commented Jan 15, 2025

Uh oh!

Uh oh!

Uh oh!

c960657 commented Oct 31, 2024 •

edited

Loading

c960657 commented Nov 17, 2024 •

edited

Loading