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

fix: display emojis in follow notification #282

Merged
merged 1 commit into from
Jul 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/View/Notification.elm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Mastodon.Model exposing (..)
import Types exposing (..)
import View.Common as Common
import View.Events exposing (..)
import View.Formatter exposing (formatContent)
import View.Formatter exposing (formatContentWithEmojis, getDisplayNameForAccount)
import View.Status exposing (statusActionsView, statusView)


Expand Down Expand Up @@ -122,11 +122,17 @@ notificationFollowView _ { accounts } =
div [ class "status follow-profile" ]
[ Common.accountAvatarLink False Nothing account
, div [ class "username" ]
[ Common.accountLink False account
[ a
[ href <| "#account/" ++ account.id
]
(getDisplayNameForAccount account
++ [ span [ class "acct" ] [ text <| " @" ++ account.acct ]
]
)
, span [ class "btn-sm follow-profile-date" ]
[ Common.icon "time", text <| Common.formatDate created_at ]
]
, formatContent account.note []
, formatContentWithEmojis account.note [] account.emojis
|> div
[ class "status-text"
, onClick <| Navigate ("#account/" ++ account.id)
Expand Down
Loading