0.45.5

components/scenes/meta.vue

@@ -18,7 +18,7 @@
 		</div>
 
 		<Link
-			:href="scene.watchUrl"
+			:href="user?.abilities.some((ability) => ability.plainUrls) ? scene.url : scene.watchUrl"
 			:title="scene.date ? format(scene.date.toISOString(), 'y-MM-dd hh:mm') : `Release date unknown, added ${format(scene.createdAt, 'y-MM-dd')}`"
 			target="_blank"
 			class="date-link nolink"
@@ -52,6 +52,10 @@ defineProps({
 		type: Object,
 		default: null,
 	},
+	user: {
+		type: Object,
+		default: null,
+	},
 });
 </script>
 

components/scenes/tile.vue

@@ -38,6 +38,7 @@
 
 			<Meta
 				:scene="scene"
+				:user="user"
 				class="meta-full"
 			/>
 

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.45.4",
+  "version": "0.45.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.45.4",
+      "version": "0.45.5",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.8",
         "@dicebear/collection": "^7.0.5",

package.json

@@ -89,7 +89,7 @@
   "overrides": {
     "vite": "$vite"
   },
-  "version": "0.45.4",
+  "version": "0.45.5",
   "imports": {
     "#/*": "./*.js"
   }

pages/entities/@entitySlug/+Page.vue

@@ -43,6 +43,14 @@
 					>{{ entity.name }}</h2>
 				</a>
 
+				<a
+					v-if="user?.abilities.some((ability) => ability.plainUrls)"
+					:href="entity.url"
+					target="_blank"
+					rel="noopener"
+					class="plainurl"
+				><Icon icon="link" /></a>
+
 				<Heart
 					domain="entities"
 					:item="entity"
@@ -154,7 +162,7 @@ import Movies from '#/components/movies/movies.vue';
 import Domains from '#/components/domains/domains.vue';
 import Heart from '#/components/stashes/heart.vue';
 
-const { pageProps, routeParams } = inject('pageContext');
+const { pageProps, routeParams, user } = inject('pageContext');
 const { entity } = pageProps;
 
 const children = ref(null);
@@ -163,9 +171,7 @@ const expanded = ref(false);
 const scrollable = computed(() => children.value?.scrollWidth > children.value?.clientWidth);
 const domain = routeParams.domain;
 
-const entityUrl = (() => {
+const entityUrl = entity.affiliateUrl || entity.url || null;
-	return entity.affiliateUrl || entity.url || null;
-})();
 </script>
 
 <style scoped>
@@ -313,6 +319,25 @@ const entityUrl = (() => {
 	display: none;
 }
 
+.plainurl {
+	height: 100%;
+	display: flex;
+	align-items: center;
+	padding: 0 .25rem;
+	margin-top: -.25rem;
+
+	.icon {
+		width: 1rem;
+		height: auto;
+		padding: .5rem;
+		fill: var(--highlight);
+	}
+
+	&:hover .icon {
+		fill: var(--primary);
+	}
+}
+
 @media(--small-20) {
 	.logo {
 		padding: .5rem 1rem;

pages/scene/+Page.vue

@@ -52,7 +52,7 @@
 				</div>
 
 				<Link
-					:href="scene.watchUrl"
+					:href="user?.abilities.some((ability) => ability.plainUrls) ? scene.url : scene.watchUrl"
 					:title="scene.date ? formatDate(scene.date.toISOString(), 'y-MM-dd hh:mm') : `Release date unknown, added ${formatDate(scene.createdAt, 'y-MM-dd')}`"
 					target="_blank"
 					class="date nolink"

src/scenes.js

@@ -126,7 +126,7 @@ function curateScene(rawScene, assets, reqUser) {
 
 	const isVideoRestricted = config.media.videoRestrictions.includes(curatedScene.channel.slug) || config.media.videoRestrictions.includes(`_${curatedScene.network?.slug}`);
 
-	if ((!isVideoRestricted || reqUser?.abilities?.trailerAccess)) {
+	if (!isVideoRestricted || reqUser?.abilities?.some((ability) => ability.trailerAccess)) {
 		curatedScene.trailer = curateMedia(assets.trailer, { type: 'trailer', isRestricted: isVideoRestricted });
 		curatedScene.teaser = curateMedia(assets.teaser, { type: 'teaser', isRestricted: isVideoRestricted });
 	}

src/users.js

@@ -29,7 +29,7 @@ export function curateUser(user, _assets = {}) {
 		isIdentityVerified: user.identity_verified,
 		avatar: `/media/avatars/${user.id}_${user.username}.png`,
 		role: user.role,
-		abilities: user.abilities,
+		abilities: [...user.role_abilities || [], ...user.abilities || []],
 		createdAt: user.created_at,
 	};