Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add graphic media self label #5758

Merged
merged 18 commits into from
Oct 17, 2024
Merged

Add graphic media self label #5758

merged 18 commits into from
Oct 17, 2024

Conversation

haileyok
Copy link
Contributor

Why

Adding the ability to self-label as graphic media.

There's some style questions here that are not really up my alley, open to any suggestions on how to make this thing look nice. Presumably we may add more labels alongside Graphic in the future, so that is something to keep in mind.

Functionally though, this should work.

Test Plan

Screen.Recording.2024-10-14.at.7.47.02.PM.mov
Screen.Recording.2024-10-14.at.7.47.51.PM.mov

Copy link

github-actions bot commented Oct 15, 2024

Old size New size Diff
7.9 MB 7.9 MB 39 B (0.00%)

@surfdude29
Copy link
Contributor

surfdude29 commented Oct 15, 2024

This is a welcome addition to self-labelling, thank you 🙏

Sorry for asking this here, as I realise it would be out-of-scope for this PR, but I was wondering if consideration is being given to increasing the visibility and discoverability of the self-label dialog, as suggested in #5383 and #5523?

I think this could be pretty helpful in encouraging users to add content warnings where they're appropriate, and nicely complement the changes coming to the self-label dialog.

@qazmlp
Copy link

qazmlp commented Oct 15, 2024

That should not be mutually exclusive with adult content labels.
(Erotic content that artistically depicts blood, dismemberment or mutilation is not that uncommon.)

@haileyok haileyok changed the base branch from hailey/tweak-dialog-refresh to main October 16, 2024 15:53
@haileyok
Copy link
Contributor Author

@qazmlp yup, done

@haileyok
Copy link
Contributor Author

@surfdude29 time dependent but yea, agree.

@arcalinea arcalinea temporarily deployed to hailey/add-gore-selflabel - social-app PR #5758 October 16, 2024 16:17 — with Render Destroyed
@surfdude29
Copy link
Contributor

surfdude29 commented Oct 16, 2024

Just testing this out on the preview branch, it's looking good! 👍

One slight issue I noticed: if a post has both graphic-media and one of the adult content labels applied, only the Graphic Media description is shown in the pop-up:

IMG_7415

If it's possible to show the descriptions for both labels that would be ideal, but if not it's probably not much of a problem.

@haileyok
Copy link
Contributor Author

If I have the time yea I'll adjust that in a separate PR.

src/components/moderation/ContentHider.tsx Show resolved Hide resolved
src/components/moderation/ContentHider.tsx Show resolved Hide resolved
src/components/moderation/ContentHider.tsx Show resolved Hide resolved
Comment on lines +96 to +97
updateAdultLabels: (labels: AdultSelfLabel[]) => void
updateOtherLabels: (labels: OtherSelfLabel[]) => void
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dig the naming change, v nice

</Trans>
) : (
<Trans>
There are no self-labels that can be applied to this post.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice one

src/view/com/composer/labels/LabelsBtn.tsx Outdated Show resolved Hide resolved
postgate: AppBskyFeedPostgate.Record
threadgate: ThreadgateAllowUISetting[]
embed: EmbedDraft
}

export type ComposerAction =
| {type: 'update_richtext'; richtext: RichText}
| {type: 'update_labels'; labels: string[]}
| {type: 'update_labels'; labels: SelfLabel[]}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yayyyy types

@arcalinea arcalinea temporarily deployed to hailey/add-gore-selflabel - social-app PR #5758 October 16, 2024 22:56 — with Render Destroyed
Copy link
Member

@estrattonbailey estrattonbailey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice one!

@haileyok haileyok merged commit 2e74f98 into main Oct 17, 2024
6 checks passed
@haileyok haileyok deleted the hailey/add-gore-selflabel branch October 17, 2024 02:17
rshigg pushed a commit to rshigg/social-app that referenced this pull request Nov 2, 2024
Co-authored-by: Samuel Newman <mozzius@protonmail.com>
rshigg pushed a commit to rshigg/social-app that referenced this pull request Nov 2, 2024
Co-authored-by: Samuel Newman <mozzius@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants