Skip to content
This repository has been archived by the owner on Nov 5, 2023. It is now read-only.

Commit

Permalink
🎉 Migrate Deta Cloud to Deta Space
Browse files Browse the repository at this point in the history
  • Loading branch information
ocoke committed Mar 4, 2023
1 parent 2cca2ff commit 09da94f
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 25 deletions.
1 change: 0 additions & 1 deletion .deta/prog_info

This file was deleted.

1 change: 0 additions & 1 deletion .deta/state

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
package-lock.json
node_modules/
.deta/
.deta/
.space/
18 changes: 18 additions & 0 deletions Spacefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Spacefile Docs: https://go.deta.dev/docs/spacefile/v0
v: 0
app_name: "Detalk.js"
micros:
- name: server
src: .
engine: nodejs16
primary: true
public_routes:
- "/*"
presets:
env:
- name: DETA_DATA_KEY
description: The Data Key of Deta Space Collection. (Optional)
default: ""
- name: BASE_NAME
description: The Deta Base name for Detalk. (Optional)
default: "detalk"
14 changes: 0 additions & 14 deletions deta.json

This file was deleted.

14 changes: 12 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const express = require('express')
const app = express();
const { Deta } = require('deta');
const deta = Deta();
const deta = Deta(process.env.DETA_DATA_KEY);
const db = deta.Base(process.env.BASE_NAME || 'detalk');
const { getComment } = require('./src/getComment');
const { checkToken } = require('./src/checkToken');
Expand All @@ -14,6 +14,9 @@ const { afterComment } = require("./src/action/afterComment");
const { beforeComment } = require("./src/action/beforeComment");
const { githubLogin } = require('./src/login/github');
const { recaptcha_verify } = require('./src/recaptcha');
const port = parseInt(process.env.PORT) || 8080;

console.debug('[DEBUG] App init with Base Name: '+process.env.BASE_NAME + ' and Data Key: '+process.env.DETA_DATA_KEY);

function textconvert(text) {
text = text.replace(/[<>&"]/g,function(c){return {'<':'&lt;','>':'&gt;','&':'&amp;','"':'&quot;'}[c];});
Expand Down Expand Up @@ -744,4 +747,11 @@ app.get("/_api/init", async (req, res) => {
});


module.exports = app;
// module.exports = app;

// Detalk.js v2 supports Deta Space


app.listen(port, () => {
console.log(`Detalk.js: Listening on port ${port}`);
});
2 changes: 1 addition & 1 deletion src/action/afterComment.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// 只有评论成功才会执行
const { Deta } = require('deta');
const deta = Deta();
const deta = Deta(process.env.DETA_DATA_KEY);
const db = deta.Base(process.env.BASE_NAME || 'detalk');
const fetch = require('node-fetch');
const nodemailer = require("nodemailer");
Expand Down
2 changes: 1 addition & 1 deletion src/action/beforeComment.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// 评论前执行
const { Deta } = require('deta');
const deta = Deta();
const deta = Deta(process.env.DETA_DATA_KEY);
const db = deta.Base(process.env.BASE_NAME || 'detalk');
const fetch = require('node-fetch');
module.exports.beforeComment = async ($data, $id) => {
Expand Down
2 changes: 1 addition & 1 deletion src/checkToken.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { Deta } = require('deta');
const deta = Deta();
const deta = Deta(process.env.DETA_DATA_KEY);
const db = deta.Base(process.env.BASE_NAME || 'detalk');
const md5 = require("js-md5");
module.exports.checkToken = async (token) => {
Expand Down
2 changes: 1 addition & 1 deletion src/getComment.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { Deta } = require('deta');
const deta = Deta();
const deta = Deta(process.env.DETA_DATA_KEY);
const db = deta.Base(process.env.BASE_NAME || 'detalk');
module.exports.getComment = async (id) => {
const list = await db.get(id);
Expand Down
2 changes: 1 addition & 1 deletion src/login/github.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { Deta } = require('deta');
const deta = Deta();
const deta = Deta(process.env.DETA_DATA_KEY);
const db = deta.Base(process.env.BASE_NAME || 'detalk');
const fetch = require('node-fetch');

Expand Down
2 changes: 1 addition & 1 deletion src/recaptcha.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { Deta } = require('deta');
const deta = Deta();
const deta = Deta(process.env.DETA_DATA_KEY);
const db = deta.Base(process.env.BASE_NAME || 'detalk');
const fetch = require('node-fetch');

Expand Down

0 comments on commit 09da94f

Please sign in to comment.