diff --git a/README.md b/README.md
index 5bd1b26f..12d01140 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.o
* [ico](https://dl.thedesk.top/press/TheDesk.ico)
* [icns](https://dl.thedesk.top/press/TheDesk.icns)
+The default sound of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
+
## Terms of Use/利用規約
* [利用規約(Terms of Use(ja))](https://thedesk.top/tos.html)
diff --git a/app/css/master.css b/app/css/master.css
index 74e7b81c..e4ece881 100644
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -30,6 +30,8 @@ option {
}
#mainView {
padding: 10px;
+ overflow:scroll;
+ height: auto;
}
#message {
display: none;
diff --git a/app/css/tl.css b/app/css/tl.css
index 42df4407..754ea4cd 100644
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -249,6 +249,29 @@ grid-area: toot;
margin:2px;
grid-area: side;
}
+
+.quote-renote{
+ display: grid;
+ grid-template-columns: 43px 2fr 1fr;
+ grid-template-areas: 'ricon ruser' 'ricon rtext';
+ border: 1px solid;
+ margin-top: 3px;
+ padding: 1px;
+ border-radius: 3px;
+}
+.renote-icon{
+ grid-area: ricon;
+}
+.renote-icon img{
+ width:43px;
+}
+.renote-user{
+ grid-area: ruser;
+}
+.renote-text{
+ grid-area: rtext;
+}
+
.btn-flat{
color:var(--color);
}
diff --git a/app/js/platform/end.js b/app/js/platform/end.js
index 4e9adaf2..7bb937c1 100644
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -181,4 +181,21 @@ const {
} = require('electron');
webviewDom.addEventListener('new-window', function(e) {
shell.openExternal(e.url);
-});
\ No newline at end of file
+});
+function playSound() {
+ window.AudioContext = window.AudioContext || window.webkitAudioContext;
+ context = new AudioContext();
+ context.createBufferSource().start(0);
+ context.decodeAudioData(request.response, function (buf) {
+ console.log(source)
+ source.buffer = buf;
+ source.loop = false;
+ });
+ source = context.createBufferSource();
+ volumeControl = context.createGain();
+ source.connect(volumeControl);
+ volumeControl.connect(context.destination);
+ volumeControl.gain.value=0.8
+ console.log(volumeControl)
+ source.start(0);
+}
\ No newline at end of file
diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js
index 8164ab1a..761e4d96 100644
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -296,7 +296,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
")
";
var boostback = "shared";
var uniqueid=toot.id;
- var toot = toot.renote;
+ if(!toot.text){
+ var toot = toot.renote;
+ }
var dis_name=escapeHTMLtemp(toot.user.name);
var uniqueid=toot.id;
var actemojick=false
@@ -636,9 +638,11 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
});
poll='