remove ipfsCid
This commit is contained in:
parent
69310e8229
commit
741b06d22e
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "futureporn",
|
||||
"version": "3.4.0",
|
||||
"version": "3.4.5",
|
||||
"private": true,
|
||||
"description": "Dedication to the preservation of lewdtuber history",
|
||||
"license": "Unlicense",
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
<footer class="footer mt-5">
|
||||
<div class="content has-text-centered">
|
||||
<p>
|
||||
<strong>Futureporn <%= meta('version') %></strong> made with love by <a href="https://t.co/I8p0oH0AAB">@CJ_Clippy</a>.
|
||||
<strong>Futureporn <%= meta('version') %></strong> made with love by <a href="https://cjclippy.carrd.co/">@CJ_Clippy</a>.
|
||||
</p>
|
||||
|
||||
|
||||
|
||||
@ -5,8 +5,7 @@
|
||||
*
|
||||
* This middleware handles setting data.user for auth purposes
|
||||
*/
|
||||
|
||||
module.exports = function ({ meta, redirect, request, auth }) {
|
||||
module.exports = function ({ auth }, next) {
|
||||
|
||||
let user;
|
||||
|
||||
@ -14,5 +13,5 @@ module.exports = function ({ meta, redirect, request, auth }) {
|
||||
user = $app.findFirstRecordByData('users', 'id', auth.id);
|
||||
}
|
||||
|
||||
return { user }
|
||||
next({ user })
|
||||
}
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
module.exports = (api, next) => {
|
||||
const { auth, redirect } = api
|
||||
module.exports = ({ auth, redirect }, next) => {
|
||||
|
||||
if (!auth) {
|
||||
return redirect('/auth/login', {
|
||||
message: 'You must be logged in to access this page',
|
||||
})
|
||||
}
|
||||
console.log('calling next()', next)
|
||||
next()
|
||||
}
|
||||
|
||||
@ -35,8 +35,8 @@
|
||||
dbg("the user is NOT new");
|
||||
}
|
||||
|
||||
console.log(JSON.stringify(authData, null, 2))
|
||||
dbg("authData:", stringify(authData))
|
||||
// console.log(JSON.stringify(authData, null, 2))
|
||||
// dbg("authData:", stringify(authData))
|
||||
|
||||
|
||||
user.set('patreonAccessToken', authData.meta.accessToken);
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
try {
|
||||
provider = body().provider
|
||||
const url = requestOAuth2Login(provider)
|
||||
console.log('url is as follows')
|
||||
console.log(url)
|
||||
// console.log('url is as follows')
|
||||
// console.log(url)
|
||||
response.redirect(url)
|
||||
} catch (error) {
|
||||
console.log("FAILURE! We failed to get the OAuth2Login from provider", provider)
|
||||
console.error("FAILURE! We failed to get the OAuth2Login from provider", provider)
|
||||
error = error.message
|
||||
}
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ module.exports = function (api) {
|
||||
username: p.get('publicUsername'),
|
||||
}));
|
||||
|
||||
console.log('Patrons:', JSON.stringify(patrons, null, 2));
|
||||
// console.log('Patrons:', JSON.stringify(patrons, null, 2));
|
||||
|
||||
return { patrons };
|
||||
|
||||
|
||||
@ -13,11 +13,11 @@ module.exports = function (api) {
|
||||
console.error('error!', e.message);
|
||||
|
||||
if (e.message.match(/no rows/)) {
|
||||
console.log('we are sending 404')
|
||||
console.error('we are sending 404')
|
||||
return response.html(404, 'VOD not found')
|
||||
|
||||
} else {
|
||||
console.log('we are sending error 500')
|
||||
console.error('we are sending error 500')
|
||||
return response.html(500, 'Unknown internal error while fetching vod')
|
||||
|
||||
}
|
||||
|
||||
@ -59,10 +59,6 @@
|
||||
</p>
|
||||
<% } %>
|
||||
|
||||
<% if (data.vod?.get('ipfsCid')) { %>
|
||||
<p><b id="ipfs-cid">IPFS CID:</b> <%= data.vod?.get('ipfsCid') %></p>
|
||||
<% } %>
|
||||
|
||||
<% if (data.vod?.get('magnetLink')) { %>
|
||||
<p><b id="magnet-link">Magnet Link:</b> <%= data.vod?.get('magnetLink') %></p>
|
||||
<% } %>
|
||||
|
||||
@ -4,9 +4,7 @@
|
||||
|
||||
|
||||
/** @type {import('pocketpages').PageDataLoaderFunc} */
|
||||
module.exports = function (api) {
|
||||
const { params, request, pb } = api;
|
||||
|
||||
module.exports = function ({ params, request, pb }, next) {
|
||||
const perPage = params.perPage || 25;
|
||||
const page = params.page || 1;
|
||||
const vtuber = $app.findFirstRecordByData('vtubers', 'slug', params.slug);
|
||||
@ -33,7 +31,7 @@ module.exports = function (api) {
|
||||
// console.log(eerrs)
|
||||
|
||||
|
||||
return { vods, vtuber };
|
||||
next({ vods, vtuber });
|
||||
|
||||
|
||||
};
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
<%# VTuber Image %>
|
||||
<figure class="image is-128x128">
|
||||
<img src="/api/files/vtubers/<%= data.vtuber?.id %>/<%= data.vtuber?.get('image') %>?thumb=128x128" alt="<%= data.vtuber?.get?.('displayName') || 'VTuber' %>" />
|
||||
<img src="/api/files/vtubers/<%= data.vtuber?.id %>/<%= data.vtuber?.get('image') %>?height=128&width=128" alt="<%= data.vtuber?.get?.('displayName') || 'VTuber' %>" />
|
||||
</figure>
|
||||
</div>
|
||||
<div class="column">
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
* This middleware populates pocketpages meta fields
|
||||
*/
|
||||
|
||||
module.exports = function ({ meta, redirect, request, auth }) {
|
||||
module.exports = function ({ meta, redirect, request, auth }, next) {
|
||||
meta('title', 'Futureporn.net')
|
||||
meta('description', 'Dedication to the preservation of Lewdtuber history')
|
||||
meta('image', 'https://futureporn.net/assets/logo.png')
|
||||
meta('image', 'https://futureporn.net/logo.png')
|
||||
meta('version', require(`../../package.json`)?.version)
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
let user;
|
||||
|
||||
if (auth) {
|
||||
console.log('request.auth is present id:', auth.get('id'))
|
||||
// console.log('request.auth is present id:', auth.get('id'))
|
||||
user = $app.findFirstRecordByData('users', 'id', auth.id);
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
}
|
||||
|
||||
const signals = datastar.readSignals(request, {})
|
||||
console.log('signals as followssssssss', JSON.stringify(signals));
|
||||
// console.log('signals as followssssssss', JSON.stringify(signals));
|
||||
|
||||
user.set('publicUsername', signals.publicUsername);
|
||||
$app.save(user);
|
||||
|
||||
@ -12,7 +12,7 @@ const feed = {
|
||||
home_page_url: "https://futureporn.net",
|
||||
feed_url: "https://futureporn.net/vods/feed.json",
|
||||
description: meta('description'),
|
||||
icon: "https://futureporn.net/assets/logo.png",
|
||||
icon: "https://futureporn.net/logo.png",
|
||||
author: {
|
||||
name: "CJ_Clippy",
|
||||
url: "https://futureporn.net"
|
||||
@ -24,7 +24,6 @@ const feed = {
|
||||
title: vod.title,
|
||||
announceUrl: vod.get('announceUrl'),
|
||||
id: vod.get('id'),
|
||||
ipfsCid: vod.get('ipfsCid'),
|
||||
magnetLink: vod.get('magnetLink'),
|
||||
image: vod.get('thumbnail'),
|
||||
date_modified: vod.get('updated'),
|
||||
|
||||
@ -8,6 +8,9 @@ async function main() {
|
||||
// upload the site
|
||||
await spawn('rsync', [
|
||||
'-avz',
|
||||
'--delete',
|
||||
'--exclude=pocketbase',
|
||||
'--exclude=std.log',
|
||||
'--exclude=pb_data',
|
||||
'--exclude=*.local',
|
||||
'-e',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user