forked from MapComplete/MastodonBot
Small improvements
This commit is contained in:
parent
e897c3b4e8
commit
c18149c7e2
3 changed files with 11 additions and 4 deletions
|
@ -17,6 +17,7 @@
|
||||||
"build": "tsc",
|
"build": "tsc",
|
||||||
"lint": "tslint --project ./tsconfig.json -t stylish",
|
"lint": "tslint --project ./tsconfig.json -t stylish",
|
||||||
"start": "ts-node src/index.ts",
|
"start": "ts-node src/index.ts",
|
||||||
|
"daily": "ts-node src/index.ts | tee -a log_`date --iso-8601`.txt",
|
||||||
"test": "doctest-ts-improved src/ && mocha --require ts-node/register \"./**/*.doctest.ts\" && (find . -type f -name \"*.doctest.ts\" | xargs rm)"
|
"test": "doctest-ts-improved src/ && mocha --require ts-node/register \"./**/*.doctest.ts\" && (find . -type f -name \"*.doctest.ts\" | xargs rm)"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -205,7 +205,7 @@ export class Postbuilder {
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
public async buildMessage(): Promise<void> {
|
public async buildMessage(date:string): Promise<void> {
|
||||||
const changesets = this._changesetsMade
|
const changesets = this._changesetsMade
|
||||||
const perContributor = new Histogram(changesets, cs => cs.properties.uid)
|
const perContributor = new Histogram(changesets, cs => cs.properties.uid)
|
||||||
|
|
||||||
|
@ -226,7 +226,7 @@ export class Postbuilder {
|
||||||
const {totalImagesCreated, attachmentIds, imgAuthors, totalImageContributorCount} = await this.prepareImages(changesets, 12)
|
const {totalImagesCreated, attachmentIds, imgAuthors, totalImageContributorCount} = await this.prepareImages(changesets, 12)
|
||||||
|
|
||||||
let toSend: string[] = [
|
let toSend: string[] = [
|
||||||
"Today, " + perContributor.keys().length + " different persons made " + totalStats.total + " changes to #OpenStreetMap using https://mapcomplete.osm.be .\n",
|
"Yesterday, " + perContributor.keys().length + " different persons made " + totalStats.total + " changes to #OpenStreetMap using https://mapcomplete.osm.be .\n",
|
||||||
]
|
]
|
||||||
|
|
||||||
for (let i = 0; i < this._config.postSettings.topContributorsNumberToShow - 1 && i < topContributors.length; i++) {
|
for (let i = 0; i < this._config.postSettings.topContributorsNumberToShow - 1 && i < topContributors.length; i++) {
|
||||||
|
@ -270,7 +270,9 @@ export class Postbuilder {
|
||||||
await this._poster.writeMessage([
|
await this._poster.writeMessage([
|
||||||
"In total, "+totalImageContributorCount+" different contributors uploaded "+totalImagesCreated+" images.\n",
|
"In total, "+totalImageContributorCount+" different contributors uploaded "+totalImagesCreated+" images.\n",
|
||||||
"Images in this thread are randomly selected from them and were made by: ",
|
"Images in this thread are randomly selected from them and were made by: ",
|
||||||
...Array.from(new Set<string>(imgAuthors)).map(auth => "- "+auth )
|
...Array.from(new Set<string>(imgAuthors)).map(auth => "- "+auth ),
|
||||||
|
"",
|
||||||
|
"Changeset of "+date
|
||||||
|
|
||||||
].join("\n"),{
|
].join("\n"),{
|
||||||
inReplyToId: secondPost["id"],
|
inReplyToId: secondPost["id"],
|
||||||
|
@ -302,6 +304,10 @@ export class Postbuilder {
|
||||||
const attachmentIds: string[] = []
|
const attachmentIds: string[] = []
|
||||||
const imgAuthors: string[] = []
|
const imgAuthors: string[] = []
|
||||||
for (const randomImage of randomImages) {
|
for (const randomImage of randomImages) {
|
||||||
|
if(this._config.mastodonAuth.dryrun){
|
||||||
|
console.log("Not uploading/downloading image:"+randomImage.image+" dryrun")
|
||||||
|
continue
|
||||||
|
}
|
||||||
const id = randomImage.image.substring(randomImage.image.lastIndexOf("/") + 1)
|
const id = randomImage.image.substring(randomImage.image.lastIndexOf("/") + 1)
|
||||||
const path = this._config.cacheDir + "/image_" + id
|
const path = this._config.cacheDir + "/image_" + id
|
||||||
await Utils.DownloadBlob(randomImage.image, path)
|
await Utils.DownloadBlob(randomImage.image, path)
|
||||||
|
|
|
@ -33,7 +33,7 @@ export class Main {
|
||||||
let changesets: ChangeSetData[] = await osmcha.DownloadStatsForDay(today.getUTCFullYear(), today.getUTCMonth() + 1, today.getUTCDate() - 1)
|
let changesets: ChangeSetData[] = await osmcha.DownloadStatsForDay(today.getUTCFullYear(), today.getUTCMonth() + 1, today.getUTCDate() - 1)
|
||||||
|
|
||||||
console.log("Building post...")
|
console.log("Building post...")
|
||||||
await new Postbuilder(this._config, poster, changesets).buildMessage()
|
await new Postbuilder(this._config, poster, changesets).buildMessage(today.getUTCFullYear()+"-"+ (today.getUTCMonth() + 1) + (today.getUTCDate() - 1))
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue