search

iwa / Q-Bot

Custom Discord Bot made for Qumu's Discord Server
0 stars 0 forks source link

Let's try this again #25

Closed Hyperfresh closed 4 years ago

Hyperfresh commented 4 years ago

Refer to #24

Hyperfresh commented 4 years ago

Fixed conflicts as per e3a3923

Hyperfresh commented 4 years ago

** seems i need to fix ##[error]src/index.ts(356,22): error TS2304: Cannot find name 'img'. - will do in a sec

Hyperfresh commented 4 years ago

ok now im confused, there's no code in those lines, hmm lemme investigate more

Hyperfresh commented 4 years ago

'ejs' refers to a UMD global, but the current file is a module. Consider adding an import instead.

module? hmm

Hyperfresh commented 4 years ago

'img' still broken but ejs does. Still investigating.

iwa commented 4 years ago

hey! thanks for the PR c: you don't have to create a new PR in order to change the target branch, I can just change it by myself dw

i'm gonna resolve the conflicts it comes because I still haven't merged dev to master yet, and as I made a lot of big changes, it's doing some kind of shit

Hyperfresh commented 4 years ago

Ah k, I’ll have to investigate how to set that all up correctly later ^ ^

From: Pierre notifications@github.com Date: Tuesday, 12 May 2020 at 5:48 pm To: iwa/Q-Bot Q-Bot@noreply.github.com Cc: Hyperfresh8080 hyperfresh@outlook.com.au, Author author@noreply.github.com Subject: Re: [iwa/Q-Bot] Let's try this again (#25)

@iwa approved this pull request.

fixed the things that were wrong + deleted some changes

if you want to keep a custom README on your repo, i think you should create a new branch with only the readme, and make this branch default, so it won't include it in your PRs cause otherwise i'll have to always override it as I did today

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://github.com/iwa/Q-Bot/pull/25#pullrequestreview-409805487, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AHQEXADAFLEO3STNWZ2WBNLRREA3XANCNFSM4M6NS4FQ.

iwa commented 4 years ago

alrighty, thanks for the PR anyways c: