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

Change likes to reactions... #8187

Draft
wants to merge 99 commits into
base: release-3.0
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
130cca4
Initial commit to change likes to reactions...
Oldiesmann Apr 27, 2024
ab2b1d5
Create the reactions table and change the ID column to match SMF stan…
Oldiesmann Apr 28, 2024
08ca4ad
Handle upgrades - creating/renaming things as needed.
Oldiesmann Apr 29, 2024
5714530
Consistency is a good thing...
Oldiesmann Apr 29, 2024
47ebfbd
Update with changes from recurring events
Oldiesmann May 2, 2024
55fdca3
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann May 3, 2024
9e85a05
Update permission and setting...
Oldiesmann May 4, 2024
0b0b869
Rename Like.php and the Like class. Also adjusted another language st…
Oldiesmann May 5, 2024
ac040fa
More renaming. Also some other minor fixes
Oldiesmann May 5, 2024
54a02fd
Missed something
Oldiesmann May 5, 2024
a089270
Pull in latest upstream changes
Oldiesmann May 5, 2024
f6bf12b
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann May 11, 2024
632bb5f
Merge latest upstream changes
Oldiesmann May 16, 2024
b7e845b
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann May 16, 2024
58a6dfb
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann May 18, 2024
4a3289f
Add support for changing the order of available reactions
Oldiesmann May 18, 2024
bd372a2
Change getLikedMsgs to getReactedMsgs and update the logic slightly
Oldiesmann May 18, 2024
7f1ab57
Change a few more things...
Oldiesmann May 18, 2024
ab846bf
Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reac…
Oldiesmann May 27, 2024
0c39327
Fix a typo and update the stats info.
Oldiesmann May 27, 2024
09c5379
Language file tweak for stats.
Oldiesmann May 27, 2024
26bbca9
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann May 29, 2024
7cea89f
Rename the template and a bunch of other stuff...
Oldiesmann Jun 1, 2024
b49770a
Create a new trait for loading reactions.
Oldiesmann Jun 2, 2024
0cbfb60
This is handled by the trait so don't need it now...
Oldiesmann Jun 2, 2024
5ab2119
A couple of minor tweaks...
Oldiesmann Jun 6, 2024
5cb6c5d
Add the initial file for the admin stuff and modify the admin menu
Oldiesmann Jun 8, 2024
e7e5b8a
Move the settings to the new file and add initial code for handling u…
Oldiesmann Jun 10, 2024
82cbe71
Minor tweaks and such
Oldiesmann Jun 10, 2024
51c8f6a
Fix the typo, add a comment block and remove the unneeded trait property
Oldiesmann Jun 10, 2024
ef25d62
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann Jun 10, 2024
b38c849
Code to handle adding/removing/updating reactions and initial code fo…
Oldiesmann Jun 14, 2024
2992985
HTML5, not XHTML...
Oldiesmann Jun 14, 2024
2b51004
More random fixes and such
Oldiesmann Jun 17, 2024
5b3cbc1
A few more minor tweaks:
Oldiesmann Jun 22, 2024
968de8a
More fun...
Oldiesmann Jun 22, 2024
2f5926f
- Change new row thing from link to button
Oldiesmann Jun 22, 2024
1c1c313
Add function to output the data for the check column
Oldiesmann Jun 23, 2024
dad8ba0
Add constructor, change the likes permission text string and create l…
Oldiesmann Jun 23, 2024
9172e3e
Finish menu and add language strings
Oldiesmann Jun 23, 2024
2424ffb
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann Jun 23, 2024
67d86b0
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann Jun 27, 2024
cf7d01f
Consistency and all that...
Oldiesmann Jun 27, 2024
0370de9
Oops
Oldiesmann Jun 27, 2024
197d3e4
Another typo; also fix typos in Postgres
Oldiesmann Jun 27, 2024
92381b2
Another typo and work around upgrade_query not supporting {db_prefix}
Oldiesmann Jun 27, 2024
564b974
Fun fact: PHP doesn't like trying to implode() a string
Oldiesmann Jun 27, 2024
e4c6223
A few more minor fixes
Oldiesmann Jun 27, 2024
c5fd7cc
More fixes and general cleanup.
Oldiesmann Jun 28, 2024
3688a33
Missing language strings
Oldiesmann Jun 28, 2024
c34c257
There's such a thing as too many permissions, right?
Oldiesmann Jun 28, 2024
1a8c0d6
Forgot to finish the settings stuff...
Oldiesmann Jun 28, 2024
7578e14
More missing language strings
Oldiesmann Jun 28, 2024
9a880be
A couple more typos
Oldiesmann Jun 28, 2024
e373a4f
More bugs
Oldiesmann Jun 28, 2024
495f1f2
More typos and missing language strings
Oldiesmann Jun 28, 2024
608173b
Typos are sooo much fun...
Oldiesmann Jun 28, 2024
d4a472a
More cleanup
Oldiesmann Jun 28, 2024
b91fd9c
Remove currently unused column from install SQL files
Oldiesmann Jun 28, 2024
56f2198
Fix URL for saving settings
Oldiesmann Jul 2, 2024
9797226
Found a missing quote
Oldiesmann Jul 2, 2024
0615afc
Duplicate column
Oldiesmann Jul 2, 2024
5c9e655
Typo
Oldiesmann Jul 2, 2024
c200d56
A few more minor tweaks
Oldiesmann Jul 2, 2024
29c8ada
Another typo
Oldiesmann Jul 2, 2024
058e069
Fix our add button
Oldiesmann Jul 2, 2024
4d1e387
A couple more typos
Oldiesmann Jul 2, 2024
24dfc97
Make our add button look nice
Oldiesmann Jul 2, 2024
2eecf35
Some more tweaks/fixes
Oldiesmann Jul 2, 2024
9129e26
Another typo
Oldiesmann Jul 2, 2024
f2c1a2b
Validate token while saving settings
Oldiesmann Jul 3, 2024
4712347
Add a title to the settings page and a token to the form on the manag…
Oldiesmann Jul 3, 2024
1d950bd
Merge branch 'SimpleMachines:release-3.0' into reactions
Oldiesmann Jul 3, 2024
a512c6a
Typo
Oldiesmann Jul 3, 2024
28b3b80
Merge branch 'reactions' of https://github.com/Oldiesmann/SMF21 into …
Oldiesmann Jul 3, 2024
3bea240
Merge branch 'release-3.0' into reactions
Oldiesmann Jul 4, 2024
0e993f4
Fix admin menu stuff.
Oldiesmann Jul 4, 2024
ff792fd
Token name typo
Oldiesmann Jul 4, 2024
f5c1854
Add a key to the insert because the code has a meltdown otherwise...
Oldiesmann Jul 4, 2024
5f4929c
Fix the queries
Oldiesmann Jul 4, 2024
2dd635e
Fix the queries the right way this time
Oldiesmann Jul 5, 2024
ee7e01f
Another typo
Oldiesmann Jul 5, 2024
64bb71d
Missed those somehow...
Oldiesmann Jul 5, 2024
83dd3d4
GROUP BY goes after WHERE, not before
Oldiesmann Jul 5, 2024
bddc492
Too many typos...
Oldiesmann Jul 5, 2024
2cb628a
Fix our updates array
Oldiesmann Jul 5, 2024
2c2c26b
Properly fix the update this time.
Oldiesmann Jul 5, 2024
b5d397f
Final fixes. Everything will work now.
Oldiesmann Jul 5, 2024
6af7ee2
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann Jul 6, 2024
38a52d6
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann Jul 11, 2024
9227df4
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann Jul 25, 2024
8268275
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann Aug 1, 2024
b7f9491
Add code to load reaction information for posts
Oldiesmann Aug 5, 2024
6f62684
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann Aug 16, 2024
a3757cf
Likes -> reacts...
Oldiesmann Aug 17, 2024
3f5ad54
Delete reactions when a topic is deleted
Oldiesmann Aug 17, 2024
64394fe
Make sure the reaction ID passed in the URL is valid
Oldiesmann Aug 18, 2024
4e7601b
Merge branch 'smf3' of https://github.com/Oldiesmann/SMF21 into react…
Oldiesmann Sep 20, 2024
252c3d8
Merge branch 'smf3' of github.com:Oldiesmann/SMF21 into reactions
Oldiesmann Nov 23, 2024
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
4 changes: 3 additions & 1 deletion Languages/en_US/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,9 @@
$txt['board_perms_deny'] = 'Deny';
$txt['all_boards_in_cat'] = 'All boards in this category';

$txt['likes_like'] = 'Membergroups allowed to like posts';
$txt['reacts_react'] = 'Membergroups allowed to react to posts';
$txt['reactions_manage'] = 'Reactions';
$txt['manage_reactions_desc'] = 'This area allows you to manage reactions';

$txt['mention'] = 'Membergroups allowed to mention users';

Expand Down
2 changes: 1 addition & 1 deletion Languages/en_US/Alerts.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
$txt['alert_topic_unapproved_reply'] = '{member_link} replied to your unapproved topic, {topic_msg}, in {board_msg}';
$txt['alert_msg_quote'] = '{member_link} quoted you in {msg_msg}';
$txt['alert_msg_mention'] = '{member_link} mentioned you in {msg_msg}';
$txt['alert_msg_like'] = '{member_link} liked your post, {msg_msg}';
$txt['alert_msg_react'] = '{member_link} reacted to your post, {msg_msg}';
$txt['alert_msg_report'] = '{member_link} reported the post {msg_msg}';
$txt['alert_msg_report_reply'] = '{member_link} replied to the report about {msg_msg}';
$txt['alert_member_report'] = '{member_link} reported the profile of {profile_msg}';
Expand Down
34 changes: 19 additions & 15 deletions Languages/en_US/General.php
Original file line number Diff line number Diff line change
Expand Up @@ -812,25 +812,29 @@
// Mentions
$txt['mentions'] = 'Mentions';

// Likes
$txt['likes'] = 'Likes';
// Reactions. Previously "likes".
$txt['reactions'] = 'Reactions';
// Leave these two for now - "like" will still be the default
$txt['like'] = 'Like';
$txt['unlike'] = 'Unlike';
$txt['like_success'] = 'Your content was successfully liked.';
$txt['like_delete'] = 'Your content was successfully deleted.';
$txt['like_insert'] = 'Your content was successfully inserted.';
$txt['like_error'] = 'There was an error with your request.';
$txt['like_disable'] = 'Likes feature is disabled.';
$txt['not_valid_like_type'] = 'The liked type is not a valid type.';
$txt['likes_count'] = '{num, plural,
one {<a href="{url}"># person</a> likes this.}
other {<a href="{url}"># people</a> like this.}

// Todo - i18n this? Maybe react_{type}_success?
$txt['react_success'] = 'You succesfully reacted to the content ';
$txt['react_delete'] = 'Your content was successfully deleted.';
$txt['react_insert'] = 'Your content was successfully inserted.';
$txt['react_error'] = 'There was an error with your request.';
$txt['reactions_disable'] = 'Reactions feature is disabled.';
$txt['not_valid_react_type'] = 'The reacted type is not a valid type.';
$txt['reactions_count'] = '{num, plural,
one {<a href="{url}"># person</a> reacted to this.}
other {<a href="{url}"># people</a> reacted to this.}
}';
$txt['you_likes_count'] = '{num, plural,
=0 {You like this.}
one {You and <a href="{url}"># other person</a> like this.}
other {You and <a href="{url}"># other people</a> like this.}
$txt['you_reactions_count'] = '{num, plural,
=0 {You reacted to this.}
one {You and <a href="{url}"># other person</a> reacted to this.}
other {You and <a href="{url}"># other people</a> reacted to this.}
}';
$txt['invalid_reaction'] = 'Invalid reaction ID';

$txt['report_to_mod'] = 'Report to moderator';
$txt['report_profile'] = 'Report profile of {member_name}';
Expand Down
6 changes: 3 additions & 3 deletions Languages/en_US/ManagePermissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@
$txt['permissionname_report_any'] = 'Report posts to the moderators';
$txt['permissionhelp_report_any'] = 'This permission adds a link to each message, allowing a user to report a post to a moderator. On reporting, all moderators on that board will receive an email with a link to the reported post and a description of the problem (as given by the reporting user).';

$txt['permissiongroup_likes'] = 'Likes';
$txt['permissionname_likes_like'] = 'Can like any content';
$txt['permissionhelp_likes_like'] = 'This permission allows a user to like any content. Users are not allowed to like their own content.';
$txt['permissiongroup_reactions'] = 'Reactions';
$txt['permissionname_reactions_react'] = 'Can react to any content';
$txt['permissionhelp_reactions_react'] = 'This permission allows a user to react to any content. Users are not allowed to react to their own content.';

$txt['permissiongroup_mentions'] = 'Mentions';
$txt['permissionname_mention'] = 'Mention others via @name';
Expand Down
19 changes: 19 additions & 0 deletions Languages/en_US/ManageReactions.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

// Version 3.0 Alpha 1; ManageReactions
$txt['reactions'] = 'Reactions';
$txt['no_reactions'] = 'No reactions yet.';
$txt['reactions_name'] = 'Reaction Name';
$txt['reacts_delete'] = 'Delete reaction';
$txt['reacts_add'] = 'Add row';
$txt['reacts_save'] = 'Save reactions';
$txt['reacts_delete'] = 'Delete selected reactions'; // This will be fixed later
$txt['reacts_delete_confirm'] = 'Are you sure you want to delete these reactions?';
$txt['reactions_manage'] = 'Manage Reactions';
$txt['admin_manage_reactions'] = 'Manage reaction settings and reactions.';
$txt['reaction_settings_explain'] = 'Enable/disable reactions and choose who can use them';
$txt['manage_reactions_desc'] = 'Add, remove and update available reactions.';
$txt['reactions_settings'] = 'Reactions Settings';
$txt['groups_reactions_react'] = 'Membergroups allowed to react to content';
$txt['enable_reacts'] = 'Enable reactions';
?>
4 changes: 2 additions & 2 deletions Languages/en_US/ManageSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@
$txt['force_ssl_complete'] = 'Force SSL throughout the forum';
$txt['search_language'] = 'Fulltext Search Language';

// Like settings.
$txt['enable_likes'] = 'Enable Likes';
// Reaction settings.
$txt['enable_reacts'] = 'Enable Reactions';

// Mention settings.
$txt['enable_mentions'] = 'Enable Mentions';
Expand Down
2 changes: 1 addition & 1 deletion Languages/en_US/Profile.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
$txt['alert_board_notify'] = 'When a new topic is created in a board I follow, I normally want to know via...';
$txt['alert_msg_mention'] = 'When my @name is mentioned in a post';
$txt['alert_msg_quote'] = 'When one of my posts is quoted';
$txt['alert_msg_like'] = 'When one of my posts is liked';
$txt['alert_msg_react'] = 'When someoe reacts to one of my posts';
$txt['alert_unapproved_reply'] = 'When a reply is made to my unapproved topic';
$txt['alert_group_pm'] = 'Personal Messages';
$txt['alert_pm_new'] = 'When I receive a new personal message';
Expand Down
4 changes: 2 additions & 2 deletions Languages/en_US/Stats.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
$txt['top_starters'] = 'Top Topic Starters';
$txt['top_time_online'] = 'Most Time Online';
$txt['stats_more_detailed'] = 'more detailed &raquo;';
$txt['top_liked_messages'] = 'Top liked messages';
$txt['top_liked_users'] = 'Top liked users';
$txt['top_reacted_messages'] = 'Top reacted messages';
$txt['top_reacted_users'] = 'Top reacted users';

$txt['average_members'] = 'Average registrations per day';
$txt['average_posts'] = 'Average posts per day';
Expand Down
Loading