Upload version 27.1.0 and 27.1.1 code to repo

Author: the-gdmo

README.md

@@ -58,6 +58,11 @@ This app is open source and licensed under the BSD 3-Clause License. You can fin
 NOTE: If you remove the app from your subreddit, it will delete all data and you will have to manually restore it to users. 
 
 ## Version History
+### 27.1.1
+* Update message content to work properly if an alternate award fail occurs (sent as a modmail which the subreddit can click the "contact my developer" to send to my creator)
+### 27.1.0
+* Add "Moderators and Post Authors" option to "Who can award points?"
+* Add notify and message setting for "Moderators and Post Authors" option
 ### 27.0.0
 * Make Post Author check actually work in terms of awarding logic if "Who can award points?" is set to "Moderators, Superusers, and Post Author (OP)"
 * Upload profile icon (possible as of Devvit 0.12.24)

devvit.json

@@ -28,7 +28,9 @@
     "media": {
         "dir": "assets"
     },
-    "marketingAssets": { "icon": "assets/repbot.png" },
+    "marketingAssets": {
+        "icon": "assets/repbot.png"
+    },
     "menu": {
         "items": [
             {

src/blocks/settings.ts

@@ -107,6 +107,8 @@ export enum AppSetting {
     NotifyOnBlockedUser = "notifyOnBlockedUser",
     NotifyOnTrustedUserAwardSuccess = "notifyOnTrustedUserAwardSuccess",
     TrustedUserAwardSuccessMessage = "trustedUserAwardSuccessMessage",
+    ModsAndPostAuthorDisallowedMessage = "modsAndPostAuthorDisallowedMessage",
+    NotifyOnModsAndPostAuthorDisallowed = "notifyOnModsAndPostAuthorDisallowed",
 }
 
 export enum TemplateDefaults {
@@ -121,7 +123,7 @@ export enum TemplateDefaults {
     ApprovedOnlyDisallowedMessage = "Only moderators and approved users can award points.",
     SelfAwardMessage = "You can't award yourself a {{name}}.",
     BotAwardMessage = "You can't award u/{{awardee}} {{name}}s.",
-    NotifyOnSelfAwardTemplate = "Hello {{awarder}}, you cannot award a {{name}} to yourself.",
+    SelfAwardTemplate = "Hello {{awarder}}, you cannot award a {{name}} to yourself.",
     NotifyOnSuccessTemplate = "+1 {{name}} awarded to u/{{awardee}} by u/{{awarder}}. Total: {{total}}{{symbol}}. {{awardee}}'s user page is located [here]({{awardeePage}}). Leaderboard is located [here]({{leaderboard}}).",
     NotifyOnSuperuserTemplate = "Hello {{awardee}},\n\nNow that you have reached {{threshold}} points you can now award points yourself, even if normal users do not have permission to. Please use the command `{{command}}` if you'd like to do this.",
     MessageToRestrictedUsers = "***ATTENTION to OP: You must award {{name}}s by replying to the successful comments. Valid command(s) are **{{commands}}**. Failure to do so may result in a ban.***\n\n***Commenters MUST put the location in spoiler tags.***\n\n*To hide text, write it like this `>!Text goes here!<` = >!Text goes here!<. [Reddit Markdown Guide]({{markdown_guide}})*.",
@@ -138,6 +140,7 @@ export enum TemplateDefaults {
     PostAuthorAwardMessage = "OPs cannot be awarded points.",
     PointAlreadyAwardedToUserViaAltCommandMessage = "{{awardee}} has already received a {{name}} for this post.",
     TrustedUserAwardSuccessMessage = "Superuser u/{{awarder}} gave an award! u/{{awardee}} now has {{total}}{{symbol}} {{name}}s. {{awardee}}'s user page is located [here]({{awardeePage}}). Leaderboard is located [here]({{leaderboard}}).",
+    ModsAndPostAuthorDisallowedMessage = "Only moderators and Post Authors (OPs) can award {{name}}s.",
 }
 
 export enum AutoSuperuserReplyOptions {
@@ -164,6 +167,27 @@ export enum NotifyOnModOnlyDisallowedReplyOptions {
     ReplyAsComment = "replybycomment",
 }
 
+export enum NotifyOnModAndPostAuthorDisallowedReplyOptions {
+    NoReply = "none",
+    ReplyByPM = "replybypm",
+    ReplyAsComment = "replybycomment",
+}
+
+const NotifyOnModAndPostAuthorDisallowedReplyOptionChoices = [
+    {
+        label: "No Notification",
+        value: NotifyOnModAndPostAuthorDisallowedReplyOptions.NoReply,
+    },
+    {
+        label: "Send user a private message",
+        value: NotifyOnModAndPostAuthorDisallowedReplyOptions.ReplyByPM,
+    },
+    {
+        label: "Reply as comment",
+        value: NotifyOnModAndPostAuthorDisallowedReplyOptions.ReplyAsComment,
+    },
+];
+
 export enum NotifyOnPostAuthorAwardReplyOptions {
     NoReply = "none",
     ReplyByPM = "replybypm",
@@ -465,6 +489,7 @@ export enum AccessControlOptions {
     ModOnly = "moderators-only",
     ModsAndSuperusers = "moderators-and-superusers",
     ModsSuperusersAndPostAuthor = "moderators-superusers-and-op",
+    ModsAndPostAuthor = "moderators-and-op",
     Everyone = "everyone",
 }
 
@@ -481,6 +506,10 @@ const AccessControlOptionChoices = [
         label: "Moderators and Superusers",
         value: AccessControlOptions.ModsAndSuperusers,
     },
+    {
+        label: "Moderators and Post Author (OP)",
+        value: AccessControlOptions.ModsAndPostAuthor,
+    },
     {
         label: "Moderators, Superusers, and Post Author (OP)",
         value: AccessControlOptions.ModsSuperusersAndPostAuthor,
@@ -850,6 +879,25 @@ export const appSettings: SettingsFormField[] = [
                 defaultValue: TemplateDefaults.ModOnlyDisallowedMessage,
                 onValidate: paragraphFieldContainsText,
             },
+            {
+                type: "select",
+                name: AppSetting.NotifyOnModsAndPostAuthorDisallowed,
+                label: "Notify users when only moderators and the Post Author (OP) can award points",
+                options: NotifyOnModAndPostAuthorDisallowedReplyOptionChoices,
+                defaultValue: [
+                    NotifyOnModAndPostAuthorDisallowedReplyOptions.NoReply,
+                ],
+                onValidate: selectFieldHasOptionChosen,
+            },
+            {
+                type: "paragraph",
+                name: AppSetting.ModsAndPostAuthorDisallowedMessage,
+                label: "Mods and Post Author Disallowed Message",
+                helpText:
+                    "Message shown when a user tries to award a point but only moderators and the Post Author (OP) can award points",
+                defaultValue: TemplateDefaults.ModsAndPostAuthorDisallowedMessage,
+                onValidate: paragraphFieldContainsText,
+            },
             {
                 type: "select",
                 name: AppSetting.NotifyOnApprovedOnlyDisallowed,
@@ -1146,7 +1194,7 @@ export const appSettings: SettingsFormField[] = [
                 label: "Self Award Message",
                 helpText:
                     "Shown when someone tries to award themselves. Placeholders Supported: {{name}}, {{awarder}}",
-                defaultValue: TemplateDefaults.NotifyOnSelfAwardTemplate,
+                defaultValue: TemplateDefaults.SelfAwardTemplate,
                 onValidate: paragraphFieldContainsText,
             },
             {

src/blocks/triggers/comment/on-comment-trigger.ts

@@ -1,5 +1,10 @@
 import { CommentSubmit, CommentUpdate } from "@devvit/protos";
-import { TriggerContext, Comment, SettingsValues, User } from "@devvit/public-api";
+import {
+    TriggerContext,
+    Comment,
+    SettingsValues,
+    User,
+} from "@devvit/public-api";
 import {
     _replyToUser,
     CommentTriggerContext,
@@ -19,6 +24,7 @@ import {
     handleAltUserAction,
 } from "./user-specific-logic/alt-user-action";
 import {
+    AccessControlOptions,
     AppSetting,
     NotifyOnDisallowedFlairReplyOptions,
     NotifyOnModAwardFailReplyOptions,
@@ -135,14 +141,24 @@ export async function handleThanksEvent(
         logger.warn("❌ Could not fetch user object for awarder", { awarder });
         return;
     }
-    await checkPermissionOfUser(
+
+    const hasPermission = await userHasPermission(
         event,
         user.id,
         commentTriggerContext,
         devvitContext,
         settings,
     );
 
+    if (!hasPermission) {
+        logger.debug("❌ User does not have permission", {
+            awarder,
+            commentId: event.comment.id,
+        });
+
+        return;
+    }
+
     // ─────────────────────────────────────────────
     // Detect which command type exists
     // ─────────────────────────────────────────────
@@ -315,7 +331,7 @@ export async function unflairedPostLogic(
     // 🚫 Unflaired posts not allowed
     if (!allowUnflairedPosts && postFlairText === "") {
         // 🚫 Ignore bot’s own comments to prevent loops
-        if (event.author.name === context.appName) {
+        if (event.author.name === context.appSlug) {
             logger.debug(
                 "🤖 Bot-authored comment detected; skipping unflaired-post response",
             );
@@ -427,7 +443,7 @@ export async function flairTextNotAllowedLogic(
             return;
         }
 
-        if (event.author.name === context.appName) {
+        if (event.author.name === context.appSlug) {
             // 🚫 Ignore bot’s own comments to prevent loops
             logger.debug(
                 "🤖 Bot-authored comment detected; skipping disallowed flair response",
@@ -487,7 +503,7 @@ export async function selfAwardAttemptLogic(
     const pointName = (settings[AppSetting.PointName] as string) ?? "point";
     const selfMsgTemplate =
         (settings[AppSetting.SelfAwardMessage] as string) ??
-        TemplateDefaults.NotifyOnSelfAwardTemplate;
+        TemplateDefaults.SelfAwardTemplate;
     const notifySelf = ((settings[
         AppSetting.NotifyOnSelfAward
     ] as string[]) ?? [NotifyOnSelfAwardReplyOptions.NoReply])[0];
@@ -527,7 +543,7 @@ export async function replyToUser(
 
     // 🚫 Prevent bot loops
     if (
-        recipient.toLowerCase() === context.appName.toLowerCase() ||
+        recipient.toLowerCase() === context.appSlug.toLowerCase() ||
         recipient.toLowerCase() === "automoderator"
     ) {
         logger.debug("🤖 replyToUser: recipient is bot/system — skipping");
@@ -585,32 +601,36 @@ export async function replyToUser(
     }
 }
 
-export async function checkPermissionOfUser(
+export async function userHasPermission(
     event: CommentSubmit | CommentUpdate,
     awarderID: string,
     commentTriggerContext: CommentTriggerContext,
     devvitContext: TriggerContext,
     settings: SettingsValues,
-) {
-    if (!event.post || !event.comment) return;
+): Promise<boolean> {
+    if (!event.post || !event.comment) return false;
+
     const pointName = (settings[AppSetting.PointName] as string) ?? "point";
 
     const isMod = commentTriggerContext.isMod;
     const isSuperUser = commentTriggerContext.isSuperUser;
     const isAltUser = commentTriggerContext.isAltUser;
     const isOP = awarderID === event.post.authorId;
+
     const accessControl = ((settings[AppSetting.AccessControl] as string[]) ?? [
         "everyone",
     ])[0];
 
     const hasPermission =
-        accessControl === "everyone" ||
-        (accessControl === "moderators-only" && isMod) ||
-        (accessControl === "moderators-and-superusers" &&
+        accessControl === AccessControlOptions.Everyone ||
+        (accessControl === AccessControlOptions.ModOnly && isMod) ||
+        (accessControl === AccessControlOptions.ModsAndSuperusers &&
             (isMod || isSuperUser)) ||
-        (accessControl === "moderators-superusers-and-op" &&
+        (accessControl === AccessControlOptions.ModsSuperusersAndPostAuthor &&
             (isMod || isSuperUser || isOP)) ||
-        (accessControl === "alt-users-only" && isAltUser);
+        (accessControl === AccessControlOptions.AltUsersOnly && isAltUser) ||
+        (accessControl === AccessControlOptions.ModsAndPostAuthor &&
+            (isMod || isOP));
 
     logger.debug("Permission check", {
         accessControl,
@@ -626,37 +646,45 @@ export async function checkPermissionOfUser(
         let notifyKey: AppSetting;
 
         switch (accessControl) {
-            case "alt-users-only":
+            case AccessControlOptions.AltUsersOnly:
                 msgKey = AppSetting.AlternateUsersOnlyDisallowedMessage;
                 notifyKey = AppSetting.NotifyOnAltUserDisallowed;
                 break;
 
-            case "moderators-only":
+            case AccessControlOptions.ModOnly:
                 msgKey = AppSetting.ModOnlyDisallowedMessage;
                 notifyKey = AppSetting.NotifyOnModOnlyDisallowed;
                 break;
 
-            case "moderators-and-superusers":
+            case AccessControlOptions.ModsAndSuperusers:
                 msgKey = AppSetting.ApprovedOnlyDisallowedMessage;
                 notifyKey = AppSetting.NotifyOnApprovedOnlyDisallowed;
                 break;
 
-            case "moderators-superusers-and-op":
+            case AccessControlOptions.ModsSuperusersAndPostAuthor:
                 msgKey = AppSetting.OPOnlyDisallowedMessage;
                 notifyKey = AppSetting.NotifyOnOPOnlyDisallowed;
                 break;
 
+            case AccessControlOptions.ModsAndPostAuthor:
+                msgKey = AppSetting.ModsAndPostAuthorDisallowedMessage;
+                notifyKey = AppSetting.NotifyOnModsAndPostAuthorDisallowed;
+                break;
+
             default:
                 logger.warn("⚠️ Unknown accessControl value", {
                     accessControl,
                 });
-                return;
+                return false;
         }
 
         const denyMsg = formatMessage(
             (settings[msgKey] as string) ??
                 TemplateDefaults.ModOnlyDisallowedMessage,
-            { awarder: awarderID, name: pointName },
+            {
+                awarder: awarderID,
+                name: pointName,
+            },
         );
 
         const notifyMode = ((settings[notifyKey] as string[]) ?? ["none"])[0];
@@ -669,8 +697,10 @@ export async function checkPermissionOfUser(
             event.comment.id,
         );
 
-        return;
+        return false;
     }
+
+    return true;
 }
 
 export async function awarderIsBot(
@@ -681,7 +711,7 @@ export async function awarderIsBot(
 ) {
     if (!event.comment) return;
     if (
-        ["automoderator", devvitContext.appName.toLowerCase()].includes(
+        ["automoderator", devvitContext.appSlug.toLowerCase()].includes(
             awarder.toLowerCase(),
         )
     ) {
@@ -704,7 +734,7 @@ export async function awarderIsBot(
     const pointName = (settings[AppSetting.PointName] as string) ?? "point";
 
     if (
-        awarder === devvitContext.appName ||
+        awarder === devvitContext.appSlug ||
         awarder.toLowerCase() === "automoderator"
     ) {
         const botMsg = formatMessage(
@@ -732,7 +762,7 @@ export async function recipientIsBot(
     if (!event.comment) return;
     const pointName = (settings[AppSetting.PointName] as string) ?? "point";
     if (
-        ["automoderator", devvitContext.appName.toLowerCase()].includes(
+        ["automoderator", devvitContext.appSlug.toLowerCase()].includes(
             awarder.toLowerCase(),
         )
     ) {
@@ -741,7 +771,7 @@ export async function recipientIsBot(
     }
 
     if (
-        ["automoderator", devvitContext.appName.toLowerCase()].includes(
+        ["automoderator", devvitContext.appSlug.toLowerCase()].includes(
             recipient.toLowerCase(),
         )
     ) {

src/blocks/triggers/comment/user-specific-logic/alt-user-action.ts

@@ -108,12 +108,13 @@ export async function commentContainsAltCommand(
         }
     } catch (err) {
         const botCreator = "ryry50583583";
+        const subject = `Alternate%20Command%20Error%20in%20r/${event.subreddit.name}`;
         const message =
-            `We encountered an error which is related to the alternate command in r/${event.subreddit.name}.\n\n` +
-            `If you could take a look at it and provide any insights, that would be appreciated!\n\n` +
-            `**Error details:** ${err instanceof Error ? err.stack || err.message : String(err)}`;
+            `We%20encountered%20an%20error%20which%20is%20related%20to%20the%20alternate%20command%20in%20r/${event.subreddit.name}.%0A%0A` +
+            `If%20you%20could%20take%20a%20look%20at%20it%20and%20provide%20any%20insights,%20that%20would%20be%20appreciated!%0A%0A` +
+            `**Error details:**%20***${err instanceof Error ? err.stack || err.message : String(err)}***`;
         logger.error(
-            `If you see this error, please [contact my developer](https://www.reddit.com/message/compose?to=${botCreator}&message=${message}). ` +
+            `If you see this error, please [contact my developer](https://www.reddit.com/message/compose?to=${botCreator}&message=${message}&subject=${subject}). ` +
                 `Please send the message as-is unless you have any additional information to provide.`,
             {},
             context,