Merge branch 'main' into patch-1

modrinth · Sep 26, 2024 · 985813f · 985813f
2 parents 0dc8ba5 + 2713f0e
commit 985813f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
@@ -231,6 +231,7 @@
           </template>
           <template #revenue> <CurrencyIcon aria-hidden="true" /> Revenue </template>
           <template #analytics> <ChartIcon aria-hidden="true" /> Analytics </template>
+          <template #moderation> <ModerationIcon aria-hidden="true" /> Moderation </template>
           <template #sign-out> <LogOutIcon aria-hidden="true" /> Sign out </template>
         </OverflowMenu>
         <ButtonStyled v-else color="brand">
@@ -778,6 +779,7 @@ const userMenuOptions = computed(() => {
       link: "/settings",
     },
   ];
+
   // TODO: Only show if user has projects
   options = [
     ...options,
@@ -801,6 +803,24 @@ const userMenuOptions = computed(() => {
       link: "/dashboard/analytics",
     },
   ];
+
+  if (
+    (auth.value && auth.value.user && auth.value.user.role === "moderator") ||
+    auth.value.user.role === "admin"
+  ) {
+    options = [
+      ...options,
+      {
+        divider: true,
+      },
+      {
+        id: "moderation",
+        color: "orange",
+        link: "/moderation/review",
+      },
+    ];
+  }
+
   options = [
     ...options,
     {

diff --git a/apps/frontend/src/public/ads.txt b/apps/frontend/src/public/ads.txt
@@ -474,3 +474,16 @@ krushmedia.com, AJxF6R537a9M6CaTvK, RESELLER
 consumable.com, 2001460, DIRECT, aefcd3d2f45b5070
 
 google.com, pub-6729046591418183, RESELLER, f08c47fec0942fa0
+
+pgamssp.com, 642db2eba4eb3f6b34033505, DIRECT
+freewheel.tv, 1489202, RESELLER
+freewheel.tv, 1488706, RESELLER
+pubmatic.com, 162623, RESELLER, 5d62403b186f2ace
+rubiconproject.com, 24852, RESELLER, 0bfd66d529a55807
+video.unrulymedia.com, 5921144960123684292, RESELLER
+minutemedia.com, 01hp4as4p012, RESELLER
+onetag.com, 87f80e5d9d55274, RESELLER
+sharethrough.com, FhiWXM0L, RESELLER, d53b998a7bd4ecd2
+amxrtb.com, 105199776, RESELLER
+33across.com, 0015a00003ALsDfAAL, DIRECT, bbea06d9c4d2853c
+risecodes.com, 661fc591c3a3ef0001984071, DIRECT
diff --git a/packages/utils/parse.ts b/packages/utils/parse.ts
@@ -77,7 +77,11 @@ export const configuredXss = new FilterXSS({
     }
   },
   safeAttrValue(tag, name, value, cssFilter) {
-    if (tag === 'img' && name === 'src' && !value.startsWith('data:')) {
+    if (
+      (tag === 'img' || tag === 'video' || tag === 'audio' || tag === 'source') &&
+      (name === 'src' || name === 'srcset') &&
+      !value.startsWith('data:')
+    ) {
       try {
         const url = new URL(value)