From 285f3cb5acb596a0a0d70b37d7da28d4d258a3b9 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Fri, 7 Feb 2020 11:57:00 -0500 Subject: [PATCH] lain is a fickle mistress --- activity.go | 2 +- database.go | 2 +- docs/activitypub.7 | 2 +- docs/changelog.txt | 2 ++ docs/honk.1 | 2 +- views/account.html | 1 + views/honk.html | 7 +++++-- web.go | 5 ++++- 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/activity.go b/activity.go index 23348e7..1418582 100644 --- a/activity.go +++ b/activity.go @@ -1127,7 +1127,7 @@ func jonkjonk(user *WhatAbout, h *Honk) (junk.Junk, junk.Junk) { j["context"] = h.Convoy } case "react": - j["type"] = "EmojiReaction" + j["type"] = "EmojiReact" j["object"] = h.XID if h.Convoy != "" { j["context"] = h.Convoy diff --git a/database.go b/database.go index 5d1e5fb..5648699 100644 --- a/database.go +++ b/database.go @@ -51,7 +51,7 @@ func userfromrow(row *sql.Row) (*WhatAbout, error) { user.URL = fmt.Sprintf("https://%s/%s", serverName, user.Name) } if user.Options.Reaction == "" { - user.Options.Reaction = "😞" + user.Options.Reaction = "none" } return user, nil } diff --git a/docs/activitypub.7 b/docs/activitypub.7 index ac595f0..9a2aadf 100644 --- a/docs/activitypub.7 +++ b/docs/activitypub.7 @@ -111,7 +111,7 @@ activities. Does what it can. .It Vt Like Don't be ridiculous. -.It Vt EmojiReaction +.It Vt EmojiReact Be ridiculous. .El .Ss METADATA diff --git a/docs/changelog.txt b/docs/changelog.txt index 0aa4a4f..2e2fd48 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -4,6 +4,8 @@ changelog --- Add Reactions. ++++ Rename reactions to badonkadonks. + + Quick fix to hide all images. + Allow resending follow requests. diff --git a/docs/honk.1 b/docs/honk.1 index 3f10317..a6cb444 100644 --- a/docs/honk.1 +++ b/docs/honk.1 @@ -126,7 +126,7 @@ Sometimes a thread goes on entirely too long. Untag will hide further replies to the selected post, but without muting the entire thread. Replies higher in the tree are still received. -.It Ic react +.It Ic badonkadonk Please no. .It Ic edit Change it up. diff --git a/views/account.html b/views/account.html index 24b8f5f..9fdf94b 100644 --- a/views/account.html +++ b/views/account.html @@ -16,6 +16,7 @@