-
-
-
-
${getTimeOfDay()}好！
${nickname}
-
-
+
-
-
- ${datatime}
-
-
![]()
-
-
-
Create By 鸢尾花插件
+
+
${datatime}
+
+
“${content}”
+
+
-
-
-
-
-
-
-
-
`
let browser
@@ -385,7 +177,6 @@ export class TextMsg extends plugin {
const page = await browser.newPage()
await page.setContent(Html)
const imgElement = await page.$('#main')
- // 对图片元素进行截图
const image = Buffer.from(await imgElement.screenshot())
e.reply(segment.image(image))
} catch (error) {
--
Gitee
From e5b6e10599d60316e5bbc46b92f4fb70c859035a Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Thu, 2 Jan 2025 11:31:56 +0000
Subject: [PATCH 68/85] update apps/Jrys.js.
Signed-off-by: xiaodoubi <775146701@qq.com>
---
apps/Jrys.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/Jrys.js b/apps/Jrys.js
index 98296da..6b0fb7b 100644
--- a/apps/Jrys.js
+++ b/apps/Jrys.js
@@ -119,7 +119,7 @@ async function generateFortune (e) {
-
-
-
-
${randomCard.name_cn}
-
${randomCard.name_en}
-
-
${position}
-
-
Create By 鸢尾花插件
-
-
-
-
-
-
- `
-
- await page.setContent(Html)
- const tarotimage = Buffer.from(await page.screenshot({ fullPage: true }))
- e.reply([segment.image(tarotimage)])
- } catch (error) {
- logger.error(error)
- } finally {
- if (browser) {
- await browser.close()
- }
- }
- return true
-}
-
-async function 占卜塔罗牌 (e, replacedMsg = '', isGPT = false) {
- const forward = ['正在为您抽牌……']
- const keys = Object.keys(tarot.cards)
- const randomCards = []
- const cardPositions = []
-
- for (let i = 0; i < 3; i++) {
- let randomCard
- do {
- const randomIndex = Math.floor(Math.random() * keys.length)
- const randomKey = keys[randomIndex]
- randomCard = tarot.cards[randomKey]
- } while (randomCards.includes(randomCard))
-
- randomCards.push(randomCard)
-
- const position = Math.random() < 0.5 ? 'up' : 'down'
- cardPositions.push(position)
-
- const imageUrl = `https://gitee.com/logier/logier-plugin/raw/master/resources/%E5%A1%94%E7%BD%97%E7%89%8C/${randomCard.type}/${randomCard.pic}.webp`
-
- const forwardMsg = [
- `你抽到的第${i + 1}张牌是 ${randomCard.name_cn} (${randomCard.name_en})\n\n${position === 'up' ? '正位' : '逆位'}: ${randomCard.meaning[position]}\n\n卡牌描述： ${position === 'up' ? randomCard.info.description : randomCard.info.reverseDescription}`,
- segment.image(imageUrl)
- ]
-
- forward.push(forwardMsg)
- }
-
- if (isGPT) {
- const message = [
- { role: 'system', content: `我请求你担任塔罗占卜师的角色。 我想占卜的内容是${replacedMsg}，请你根据我抽到的三张牌，帮我解释其含义，并给我一些建议。` },
- ...randomCards.map((card, i) => ({
- role: 'user',
- content: `我抽到的第${i + 1}张牌是${card.name_cn}，并且是${cardPositions[i] === 'up' ? '正位' : '逆位'}，这代表${card.meaning[cardPositions[i]]}`
- }))
- ]
-
- const content = await gpt(message)
-
- if (content == true) {
- logger.info('gpt出错，没有返回内容')
- } else {
- forward.push(content)
- }
- }
-
- let nickname = e.nickname ? e.nickname : e.sender.card
-
- const msg = await common.makeForwardMsg(e, forward, `${nickname}的${replacedMsg}占卜`)
- await e.reply(msg)
-
- return true
-}
--
Gitee
From acb81babae8f36cd5a0a4279696a953330ef1f02 Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Thu, 2 Jan 2025 11:40:39 +0000
Subject: [PATCH 70/85] add
Signed-off-by: xiaodoubi <775146701@qq.com>
---
apps/Tarot.js | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 268 insertions(+)
create mode 100644 apps/Tarot.js
diff --git a/apps/Tarot.js b/apps/Tarot.js
new file mode 100644
index 0000000..f923d55
--- /dev/null
+++ b/apps/Tarot.js
@@ -0,0 +1,268 @@
+import puppeteer from 'puppeteer'
+import common from '../../../lib/common/common.js'
+import { readAndParseJSON, gpt } from '../utils/getdate.js'
+import setting from '../model/setting.js'
+
+export class TextMsg extends plugin {
+ constructor () {
+ super({
+ name: '[鸢尾花插件]塔罗牌', // 插件名称
+ dsc: '塔罗牌', // 插件描述
+ event: 'message', // 更多监听事件请参考下方的 Events
+ priority: 5000, // 插件优先度，数字越小优先度越高
+ rule: [
+ {
+ reg: '^#?(塔罗牌|塔罗)(.*)$', // 正则表达式,有关正则表达式请自行百度
+ fnc: '塔罗牌' // 执行方法
+ },
+ {
+ reg: '^#?(占卜)(.*)$', // 正则表达式,有关正则表达式请自行百度
+ fnc: '占卜' // 执行方法
+ },
+ {
+ reg: '^#?(彩虹塔罗牌)(.*)$', // 正则表达式,有关正则表达式请自行百度
+ fnc: '彩虹塔罗牌' // 执行方法
+ }
+ ]
+ })
+ }
+
+ get GPTconfig () {
+ return setting.getConfig('GPTconfig')
+ }
+
+ async 塔罗牌 (e) {
+ const replacedMsg = e.msg.replace(/^#?(塔罗牌|塔罗)/, '')
+
+ if (replacedMsg && this.GPTconfig.GPTKey) {
+ e.reply(`大占卜家正在为您占卜“${replacedMsg}”`, true, { recallMsg: 10 })
+ await 抽塔罗牌(e, replacedMsg, true)
+ } else {
+ e.reply('正在为您抽塔罗牌（配置gpt后发送 塔罗牌+占卜内容 可以使用AI占卜）', true, { recallMsg: 10 })
+ await 抽塔罗牌(e)
+ }
+ return true
+ }
+
+ async 占卜 (e) {
+ const replacedMsg = e.msg.replace(/^#?(占卜)/, '')
+
+ if (replacedMsg && this.GPTconfig.GPTKey) {
+ e.reply(`大占卜家正在为您占卜“${replacedMsg}”`, true, { recallMsg: 10 })
+ await 占卜塔罗牌(e, replacedMsg, true)
+ } else {
+ e.reply('正在为您抽三张塔罗牌（配置gpt后发送 占卜+占卜内容 可以抽三张AI占卜）', true, { recallMsg: 10 })
+ await 占卜塔罗牌(e)
+ }
+ return true
+ }
+
+ async 彩虹塔罗牌 (e) {
+ const keys = Object.keys(tarot.cards).filter(key => key >= 0 && key <= 21)
+ const randomKey = keys[Math.floor(Math.random() * keys.length)]
+ const randomCard = tarot.cards[randomKey]
+
+ logger.info(randomCard)
+
+ // 创建塔罗牌的正位和逆位选项并随机选择一个选项
+ const options = [`正位: ${randomCard.meaning.up}`, `逆位: ${randomCard.meaning.down}`]
+ const selection = options[Math.floor(Math.random() * options.length)]
+ let [position, meaning] = selection.split(': ')
+
+ e.reply([`你抽到的牌是……\n第${randomKey}位\n${randomCard.name_cn}（${randomCard.name_en}）\n${position}：\n${meaning}`, segment.image(`./plugins/logier-plugin/resources/nijitarot/${randomKey}.webp`)])
+
+ return true
+ }
+}
+
+const tarot = await readAndParseJSON('../data/tarot.json')
+
+async function 抽塔罗牌 (e, replacedMsg = '', isGPT = false) {
+ // 获取所有塔罗牌的键并随机选择一张塔罗牌
+ const keys = Object.keys(tarot.cards)
+ const randomKey = keys[Math.floor(Math.random() * keys.length)]
+ const randomCard = tarot.cards[randomKey]
+
+ // 获取塔罗牌的图片URL
+ const imageUrl = `https://gitee.com/logier/logier-plugin/raw/master/resources/%E5%A1%94%E7%BD%97%E7%89%8C/${randomCard.type}/${randomCard.pic}.webp`
+
+ // 创建塔罗牌的正位和逆位选项并随机选择一个选项
+ const options = [`正位: ${randomCard.meaning.up}`, `逆位: ${randomCard.meaning.down}`]
+ const selection = options[Math.floor(Math.random() * options.length)]
+ let [position, meaning] = selection.split(': ')
+
+ if (isGPT) {
+ // 创建GPT的输入内容
+ const gptInput = [
+ {
+ role: 'system',
+ content: `我请求你担任塔罗占卜师的角色。 我想占卜的内容是${replacedMsg}，我抽到的牌是${randomCard.name_cn}，并且是${selection}，请您结合我想占卜的内容来解释含义,话语尽可能简洁。`
+ }
+ ]
+
+ // 使用GPT生成内容
+ meaning = await gpt(gptInput)
+
+ // 如果没有生成内容，记录错误并结束进程
+ if (meaning == true) {
+ logger.info('[鸢尾花插件]key或url配置错误，')
+ return false
+ }
+ }
+
+ let browser
+ try {
+ browser = await puppeteer.launch({ headless: 'new', args: ['--no-sandbox', '--disable-setuid-sandbox'] })
+ const page = await browser.newPage()
+
+ let Html = `
+
+
+
+
+
+
+
${randomCard.name_cn}
+
${randomCard.name_en}
+
+
${position}
+
Create By 鸢尾花插件
+
+
+
+
+
+
+ `
+
+ await page.setContent(Html)
+ const tarotimage = Buffer.from(await page.screenshot({ fullPage: true }))
+ e.reply([segment.image(tarotimage)])
+ } catch (error) {
+ logger.error(error)
+ } finally {
+ if (browser) {
+ await browser.close()
+ }
+ }
+ return true
+}
+
+async function 占卜塔罗牌 (e, replacedMsg = '', isGPT = false) {
+ const forward = ['正在为您抽牌……']
+ const keys = Object.keys(tarot.cards)
+ const randomCards = []
+ const cardPositions = []
+
+ for (let i = 0; i < 3; i++) {
+ let randomCard
+ do {
+ const randomIndex = Math.floor(Math.random() * keys.length)
+ const randomKey = keys[randomIndex]
+ randomCard = tarot.cards[randomKey]
+ } while (randomCards.includes(randomCard))
+
+ randomCards.push(randomCard)
+
+ const position = Math.random() < 0.5 ? 'up' : 'down'
+ cardPositions.push(position)
+
+ const imageUrl = `https://gitee.com/logier/logier-plugin/raw/master/resources/%E5%A1%94%E7%BD%97%E7%89%8C/${randomCard.type}/${randomCard.pic}.webp`
+
+ const forwardMsg = [
+ `你抽到的第${i + 1}张牌是 ${randomCard.name_cn} (${randomCard.name_en})\n\n${position === 'up' ? '正位' : '逆位'}: ${randomCard.meaning[position]}\n\n卡牌描述： ${position === 'up' ? randomCard.info.description : randomCard.info.reverseDescription}`,
+ segment.image(imageUrl)
+ ]
+
+ forward.push(forwardMsg)
+ }
+
+ if (isGPT) {
+ const message = [
+ { role: 'system', content: `我请求你担任塔罗占卜师的角色。 我想占卜的内容是${replacedMsg}，请你根据我抽到的三张牌，帮我解释其含义，并给我一些建议。` },
+ ...randomCards.map((card, i) => ({
+ role: 'user',
+ content: `我抽到的第${i + 1}张牌是${card.name_cn}，并且是${cardPositions[i] === 'up' ? '正位' : '逆位'}，这代表${card.meaning[cardPositions[i]]}`
+ }))
+ ]
+
+ const content = await gpt(message)
+
+ if (content == true) {
+ logger.info('gpt出错，没有返回内容')
+ } else {
+ forward.push(content)
+ }
+ }
+
+ let nickname = e.nickname ? e.nickname : e.sender.card
+
+ const msg = await common.makeForwardMsg(e, forward, `${nickname}的${replacedMsg}占卜`)
+ await e.reply(msg)
+
+ return true
+}
--
Gitee
From 9583a3baa7589d7ab153516dade36db2ddc095b4 Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Thu, 2 Jan 2025 19:50:06 +0800
Subject: [PATCH 71/85] 1
---
apps/Tarot.js | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/apps/Tarot.js b/apps/Tarot.js
index f923d55..771d939 100644
--- a/apps/Tarot.js
+++ b/apps/Tarot.js
@@ -119,9 +119,22 @@ async function 抽塔罗牌 (e, replacedMsg = '', isGPT = false) {
-
-
-
-
-
${nickname}的${await numToChinese(new Date().getDate())}号运势为
-
${fortune.fortuneSummary}
-
${fortune.luckyStar}
-
-
${fortune.signText}
-
${fortune.unsignText}
-
-
| 相信科学，请勿迷信 |
-
Create By 鸢尾花插件
-
-
-
-
-
-
+
+
+
+
+
+
+
+
${nickname}的${await numToChinese(new Date().getDate())}号运势为
+
${fortune.fortuneSummary}
+
${fortune.luckyStar}
+
+
${fortune.signText}
+
${fortune.unsignText}
+
+
| 相信科学，请勿迷信 |
+
Create By 鸢尾花插件
+
+
+
+
+
+
+
`
let browser
@@ -200,6 +212,7 @@ async function generateFortune (e) {
browser = await puppeteer.launch({ headless: 'new', args: ['--no-sandbox', '--disable-setuid-sandbox'] })
const page = await browser.newPage()
await page.setContent(Html)
+ await page.waitForSelector('img')
const image = Buffer.from(await page.screenshot({ fullPage: true }))
e.reply(segment.image(image))
} catch (error) {
--
Gitee
From d2e16efe12b4ca125f4b51d0aef62fb70da3e74c Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Thu, 2 Jan 2025 12:09:38 +0000
Subject: [PATCH 74/85] update apps/Sign.js.
Signed-off-by: xiaodoubi <775146701@qq.com>
---
apps/Sign.js | 405 +++++++++++++--------------------------------------
1 file changed, 100 insertions(+), 305 deletions(-)
diff --git a/apps/Sign.js b/apps/Sign.js
index 0eda0f4..a60240a 100644
--- a/apps/Sign.js
+++ b/apps/Sign.js
@@ -2,27 +2,27 @@ import puppeteer from 'puppeteer'
import { getTimeOfDay, getImageUrl, getFunctionData } from '../utils/getdate.js'
import fetch from 'node-fetch'
-// TextMsg可自行更改，其他照旧即可。
export class TextMsg extends plugin {
constructor () {
super({
- name: '[鸢尾花插件]今日签到', // 插件名称
- dsc: '今日签到', // 插件描述
- event: 'message', // 更多监听事件请参考下方的 Events
- priority: 5000, // 插件优先度，数字越小优先度越高
+ name: '[鸢尾花插件]今日签到',
+ dsc: '今日签到',
+ event: 'message',
+ priority: 5000,
rule: [
{
- reg: '^#?(今日)?(签到|打卡)$', // 正则表达式,有关正则表达式请自行百度
- fnc: '今日签到' // 执行方法
+ reg: '^#?(今日)?(签到|打卡)$',
+ fnc: '今日签到'
}
]
})
}
get UrlsConfig () { return getFunctionData('Urls', 'Urls', '今日签到') }
+
async 今日签到 (e) {
let now = new Date()
- let datatime = now.toLocaleDateString('zh-CN') // 日期格式
+ let datatime = now.toLocaleDateString('zh-CN')
const response = await fetch('https://v1.hitokoto.cn')
const hitokodata = await response.json()
@@ -62,314 +62,111 @@ export class TextMsg extends plugin {
-
+
+
签到结果
+
+ .quote {
+ margin-top: 15px;
+ font-style: italic;
+ text-align: center;
+ color: #777;
+ }
+
+ #footer {
+ padding: 20px;
+ background-color: #f8f9fa;
+ text-align: center;
+ border-top: 1px solid #eee;
+ color: #555;
+ }
+
+ #footer .highlight {
+ font-weight: bold;
+ color: #0078d7;
+ }
+
-
-
-
-
-
-
-
${getTimeOfDay()}好！
${nickname}
-
-
+
-
-
- ${datatime}
-
-
![]()
-
-
-
Create By 鸢尾花插件
+
+
${datatime}
+
+
“${content}”
+
+
-
-
-
- `
-
+ `
let browser
try {
@@ -379,9 +176,7 @@ export class TextMsg extends plugin {
browser = await puppeteer.launch({ headless: 'new', args: ['--no-sandbox', '--disable-setuid-sandbox'] })
const page = await browser.newPage()
await page.setContent(Html)
-
const imgElement = await page.$('#main')
- // 对图片元素进行截图
const image = Buffer.from(await imgElement.screenshot())
e.reply(segment.image(image))
} catch (error) {
--
Gitee
From ce44cb5f85954154784a09beb1b5efed0308f679 Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Thu, 2 Jan 2025 12:10:07 +0000
Subject: [PATCH 75/85] update apps/Tarot.js.
Signed-off-by: xiaodoubi <775146701@qq.com>
---
apps/Tarot.js | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/apps/Tarot.js b/apps/Tarot.js
index 771d939..f923d55 100644
--- a/apps/Tarot.js
+++ b/apps/Tarot.js
@@ -119,22 +119,9 @@ async function 抽塔罗牌 (e, replacedMsg = '', isGPT = false) {
+
+
+
+
+
+
${nickname}的${await numToChinese(new Date().getDate())}号运势为
+
${fortune.fortuneSummary}
+
${fortune.luckyStar}
+
+
${fortune.signText}
+
${fortune.unsignText}
+
+
| 相信科学，请勿迷信 |
+
Create By 鸢尾花插件
+
+
+
+
+
+
+
+
- .image img {
- width: 100%;
- height: auto;
- object-fit: cover;
- border-radius: 10px;
- filter: brightness(95%);
- }
-
-
-
-
-
-
${nickname}的${await numToChinese(new Date().getDate())}号运势为
-
${fortune.fortuneSummary}
-
${fortune.luckyStar}
-
-
${fortune.signText}
-
${fortune.unsignText}
-
-
| 相信科学，请勿迷信 |
-
Create By 鸢尾花插件
-
-
-
-
-
-
-
`
let browser
diff --git a/apps/Tarot.js b/apps/Tarot.js
index bc781c4..2cea232 100644
--- a/apps/Tarot.js
+++ b/apps/Tarot.js
@@ -116,100 +116,93 @@ async function 抽塔罗牌 (e, replacedMsg = '', isGPT = false) {
const page = await browser.newPage()
let Html = `
-
-
-
-
-
-
-
${randomCard.name_cn}
-
${randomCard.name_en}
-
-
${position}
-
Create By 鸢尾花插件
-
-
-
-
-
-
+
+
+
+
+
+
+
${randomCard.name_cn}
+
${randomCard.name_en}
+
+
${position}
+
+
Create By 鸢尾花插件
+
+
+
+
+
+
`
await page.setContent(Html)
--
Gitee
From dfc0d332d6d0fb0c23cce5c30ce9bb8d80597d7c Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Thu, 2 Jan 2025 21:55:53 +0800
Subject: [PATCH 79/85] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/Jrys.js | 2 --
1 file changed, 2 deletions(-)
diff --git a/apps/Jrys.js b/apps/Jrys.js
index 5b69537..298726e 100644
--- a/apps/Jrys.js
+++ b/apps/Jrys.js
@@ -118,7 +118,6 @@ async function generateFortune (e) {
运势页面
-
--
Gitee
From c873d5cdc384e53aea48097cf18fd2bd94288449 Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Thu, 2 Jan 2025 21:57:51 +0800
Subject: [PATCH 80/85] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/Jrys.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/Jrys.js b/apps/Jrys.js
index 298726e..f938735 100644
--- a/apps/Jrys.js
+++ b/apps/Jrys.js
@@ -118,6 +118,7 @@ async function generateFortune (e) {
运势页面
+
--
Gitee
From f1d963ca6baf26b6e0b53decf4f69a54da2ae26c Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Fri, 3 Jan 2025 16:58:03 +0000
Subject: [PATCH 81/85] update resources/font/qweather-icons.css.
Signed-off-by: xiaodoubi <775146701@qq.com>
---
resources/font/qweather-icons.css | 55 ++++++++++++++++++++++++++++---
1 file changed, 51 insertions(+), 4 deletions(-)
diff --git a/resources/font/qweather-icons.css b/resources/font/qweather-icons.css
index ed92a11..0455238 100644
--- a/resources/font/qweather-icons.css
+++ b/resources/font/qweather-icons.css
@@ -4,12 +4,12 @@
* License: Code for MIT, Icons for CC BY 4.0
*/
+
@font-face {
font-family: "qweather-icons";
- src: url("./fonts/qweather-icons.woff2?c4a8eb216e1e59e6c4df464b9ee6f9be") format("woff2"),
-url("./fonts/qweather-icons.woff?c4a8eb216e1e59e6c4df464b9ee6f9be") format("woff"),
-url("./fonts/qweather-icons.ttf?c4a8eb216e1e59e6c4df464b9ee6f9be") format("truetype");
-}
+ src: url("https://dd.atxrom.com/qweather-icons/fonts/qweather-icons.woff2") format("woff2"),
+ url("https://dd.atxrom.com/qweather-icons/fonts/qweather-icons.woff") format("woff"),
+ url("https://dd.atxrom.com/qweather-icons/fonts/qweather-icons.ttf") format("truetype");}
[class^="qi-"]::before,
[class*=" qi-"]::before {
@@ -983,3 +983,50 @@ url("./fonts/qweather-icons.ttf?c4a8eb216e1e59e6c4df464b9ee6f9be") format("truet
.qi-hot-fill::before { content: "\f207"; }
.qi-cold-fill::before { content: "\f208"; }
.qi-unknown-fill::before { content: "\f209"; }
+
+/*Weather.css*/
+* {
+ padding: 0;
+ margin: 0;
+}
+body{
+ position:absolute;
+}
+.nei{
+ float: left;
+ box-shadow: 3px 3px 3px #666666;
+ width: 50%;
+ min-width: 400px;
+ height:100%;
+ display:flex;
+ flex-direction: column;
+ justify-content: space-between;
+ border-radius:10px 10px 10px 10px;
+ border:1px solid #a1a1a1;
+ background: rgba(255, 255, 255, 0.5);
+ z-index:1;
+ position:absolute;
+}
+p {
+ color : rgba(0,0,0, 0.6);
+ font-size:1.5rem;
+ padding: 2px;
+ word-wrap: break-word;
+ white-space: pre-wrap;
+}
+.centered-content {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ margin: 0 1rem 0 1rem;
+ height: 100%;
+}
+.tu{
+ float: left;
+ border:1px solid #000000;
+ max-width: 1024px
+}
+img{
+ border:1px solid #000000;
+ border-radius:10px 10px 10px 10px;
+}
\ No newline at end of file
--
Gitee
From 08057e97f6ff60fd8388be44551c3036a281ad63 Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Fri, 3 Jan 2025 16:58:37 +0000
Subject: [PATCH 82/85] update apps/Weather.js.
Signed-off-by: xiaodoubi <775146701@qq.com>
---
apps/Weather.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/Weather.js b/apps/Weather.js
index 358755e..b1e08dd 100644
--- a/apps/Weather.js
+++ b/apps/Weather.js
@@ -84,7 +84,7 @@ async function pushweather (e, pushcity) {
-
+
--
Gitee
From d425db75b5a9c2f09e41af7629c6c995f4916e44 Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Wed, 8 Jan 2025 00:39:58 +0800
Subject: [PATCH 83/85] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=96=B5=E5=96=B5?=
=?UTF-8?q?=E5=8F=AF=E8=83=BD=E6=8A=A5=E9=94=99=20=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=E8=AE=B0=E5=BE=97=20=E7=BE=A4=E9=87=8C=E5=96=8A=E4=B8=80?=
=?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/welcome.js | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/apps/welcome.js b/apps/welcome.js
index e18bd29..ec1cee2 100644
--- a/apps/welcome.js
+++ b/apps/welcome.js
@@ -63,20 +63,30 @@ export class outNotice extends plugin {
this.tips = '退群了'
}
- async accept () {
- if (this.e.user_id == this.e.bot.uin) return
+ async accept(event) {
+ // 如果退群的是机器人本身，则不处理
+ if (event.user_id === event.bot.uin) return;
- let name, msg
- if (this.e.member) {
- name = this.e.member.card || this.e.member.nickname
- }
+ let name = '未知用户';
- if (name) {
- msg = `${name}(${this.e.user_id}) ${this.tips}`
- } else {
- msg = `${this.e.user_id} ${this.tips}`
+ // 调试信息：输出 event.member 对象
+ logger.debug(`event.member: ${JSON.stringify(event.member)}`);
+
+ // 获取退群成员的昵称或卡片名称
+ if (event.member && (event.member.card || event.member.nickname)) {
+ name = event.member.card || event.member.nickname;
}
- logger.mark(`[退出通知]${this.e.logText} ${msg}`)
- await this.reply(msg)
+
+ // 构建通知消息
+ const msg = `${name}(${event.user_id}) ${this.tips}`;
+
+ // 记录日志
+ logger.info(`[退出通知] ${event.logText} ${msg}`);
+
+ // 回复消息到群聊
+ await this.bot.sendGroupMsg({
+ group_id: event.group_id,
+ message: msg,
+ });
}
}
--
Gitee
From 502d6f8fe3d49984150bbd35128a7321e641a04b Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Tue, 7 Jan 2025 16:47:49 +0000
Subject: [PATCH 84/85] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: xiaodoubi <775146701@qq.com>
---
apps/welcome.js | 36 +++++++++++++-----------------------
1 file changed, 13 insertions(+), 23 deletions(-)
diff --git a/apps/welcome.js b/apps/welcome.js
index ec1cee2..22b1f63 100644
--- a/apps/welcome.js
+++ b/apps/welcome.js
@@ -63,30 +63,20 @@ export class outNotice extends plugin {
this.tips = '退群了'
}
- async accept(event) {
- // 如果退群的是机器人本身，则不处理
- if (event.user_id === event.bot.uin) return;
-
- let name = '未知用户';
-
- // 调试信息：输出 event.member 对象
- logger.debug(`event.member: ${JSON.stringify(event.member)}`);
+ async accept () {
+ if (this.e.user_id == this.e.bot.uin) return
- // 获取退群成员的昵称或卡片名称
- if (event.member && (event.member.card || event.member.nickname)) {
- name = event.member.card || event.member.nickname;
+ let name, msg
+ if (this.e.member) {
+ name = this.e.member.card || this.e.member.nickname
}
- // 构建通知消息
- const msg = `${name}(${event.user_id}) ${this.tips}`;
-
- // 记录日志
- logger.info(`[退出通知] ${event.logText} ${msg}`);
-
- // 回复消息到群聊
- await this.bot.sendGroupMsg({
- group_id: event.group_id,
- message: msg,
- });
+ if (name) {
+ msg = `${name}(${this.e.user_id}) ${this.tips}`
+ } else {
+ msg = `${this.e.user_id} ${this.tips}`
+ }
+ logger.mark(`[退出通知]${this.e.logText} ${msg}`)
+ await this.reply(msg)
}
-}
+}
\ No newline at end of file
--
Gitee
From fa2fcf2355dba37ad912f2ef166304d4fbe39736 Mon Sep 17 00:00:00 2001
From: xiaodoubi <775146701@qq.com>
Date: Wed, 8 Jan 2025 02:25:12 +0800
Subject: [PATCH 85/85] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/exit.js | 27 +++++++++++++++++++++++++++
apps/welcome.js | 31 ++-----------------------------
2 files changed, 29 insertions(+), 29 deletions(-)
create mode 100644 apps/exit.js
diff --git a/apps/exit.js b/apps/exit.js
new file mode 100644
index 0000000..6e59670
--- /dev/null
+++ b/apps/exit.js
@@ -0,0 +1,27 @@
+export class outNotice extends plugin {
+ constructor () {
+ super({
+ name: '退群通知',
+ dsc: 'xx退群了',
+ event: 'notice.group.decrease'
+ })
+ /** 退群提示词 */
+ this.tips = '永久的离开了我们'
+ }
+
+ async accept() {
+ if (this.e.user_id === this.e.self_id) return
+
+ let name, msg
+ if (this.e.member) {
+ name = this.e.member.card_old || this.e.member.nickname || this.e.member.card
+ }
+ if (name) {
+ msg = `${name}(${this.e.user_id}) ${this.tips}`
+ } else {
+ msg = `${this.e.user_id} ${this.tips}`
+ }
+ logger.mark(`[退出通知]${this.e.logText} ${msg}`)
+ await this.reply([segment.image(`https://q1.qlogo.cn/g?b=qq&s=0&nk=${this.e.user_id}`),msg ])
+ }
+}
diff --git a/apps/welcome.js b/apps/welcome.js
index 22b1f63..de67c36 100644
--- a/apps/welcome.js
+++ b/apps/welcome.js
@@ -1,4 +1,5 @@
import { readAndParseJSON } from '../utils/getdate.js'
+import plugin from '../../../lib/plugins/plugin.js'
export class newcomer extends plugin {
constructor () {
@@ -18,7 +19,7 @@ export class newcomer extends plugin {
/** 冷却cd 30s */
let cd = 30
- if (this.e.user_id == this.e.bot.uin) return
+ if (this.e.user_id === this.e.bot.uin) return
/** cd */
let key = `Yz:newcomers:${this.e.group_id}`
@@ -51,32 +52,4 @@ export class newcomer extends plugin {
}
}
-export class outNotice extends plugin {
- constructor () {
- super({
- name: '退群通知',
- dsc: 'xx退群了',
- event: 'notice.group.decrease'
- })
-
- /** 退群提示词 */
- this.tips = '退群了'
- }
-
- async accept () {
- if (this.e.user_id == this.e.bot.uin) return
- let name, msg
- if (this.e.member) {
- name = this.e.member.card || this.e.member.nickname
- }
-
- if (name) {
- msg = `${name}(${this.e.user_id}) ${this.tips}`
- } else {
- msg = `${this.e.user_id} ${this.tips}`
- }
- logger.mark(`[退出通知]${this.e.logText} ${msg}`)
- await this.reply(msg)
- }
-}
\ No newline at end of file
--
Gitee