Skip to content

Commit b5c0a2a

Browse files
shaunthegeekshaunthegeek
committed
feat: #60 ignore recent space activity
1 parent 066e980 commit b5c0a2a

File tree

4 files changed

+139
-1
lines changed

4 files changed

+139
-1
lines changed

‎app/Confluence.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,14 @@ public function htmlFile2Markdown(string $filename): string
4949
libxml_use_internal_errors(true);
5050
$this->document->loadHTML($html);
5151

52-
$html = $this->document->saveHTML($this->document->getElementById('main-content'));
52+
$contentElement = $this->document->getElementById('main-content');
53+
$divElements = $contentElement->getElementsByTagName('div');
54+
foreach ($divElements as $divElement) {
55+
if ($divElement->getAttribute('class') == 'recently-updated recently-updated-social') {
56+
$divElement->parentNode->parentNode->removeChild($divElement->parentNode);
57+
}
58+
}
59+
$html = $this->document->saveHTML($contentElement);
5360
return $this->htmlConverter->convert($html);
5461
}
5562

‎tests/Unit/ConfluenceTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,12 @@ public function testParseAttachmentsOfIndex()
115115
$attachments = $confluence->parseAttachments($htmlFilePath, $markdown);
116116
$this->assertEquals([], $attachments);
117117
}
118+
119+
public function testIgnoreRecentSpaceActivity()
120+
{
121+
$confluence = new Confluence();
122+
$markdown = file_get_contents($this->dataDir . 'confluence/recent-space-activity-demo.md');
123+
$newMarkdown = $confluence->htmlFile2Markdown($this->dataDir . 'confluence/recent-space-activity-demo.html');
124+
$this->assertEquals(trim($markdown), $newMarkdown);
125+
}
118126
}

‎tests/data/confluence/recent-space-activity-demo.html

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>空间 1 : Image Demo</title>
5+
<link rel="stylesheet" href="styles/site.css" type="text/css"/>
6+
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
7+
</head>
8+
9+
<body class="theme-default aui-theme-default">
10+
<div id="page">
11+
<div id="main" class="aui-page-panel">
12+
<div id="main-header">
13+
<div id="breadcrumb-section">
14+
<ol id="breadcrumbs">
15+
<li class="first">
16+
<span><a href="index.html">Demo</a></span>
17+
</li>
18+
<li>
19+
<span><a href="65591.html">Demo</a></span>
20+
</li>
21+
</ol>
22+
</div>
23+
<h1 id="title-heading" class="pagetitle">
24+
<span id="title-text">
25+
空间 1 : Image Demo
26+
</span>
27+
</h1>
28+
</div>
29+
30+
<div id="content" class="view">
31+
<div class="page-metadata">
32+
Created by <span class='author'> admin</span>, last modified on 七月 05, 2021
33+
</div>
34+
<div id="main-content" class="wiki-content group">
35+
<h1>hello</h1>
36+
<div class="cell normal" data-type="normal">
37+
<div class="innerCell">
38+
<h2 id="首页-Recentspaceactivity">Recent space activity</h2>
39+
<div class="recently-updated recently-updated-social">
40+
<div class="hidden parameters">
41+
<input type="hidden" id="changesUrl" value="/plugins/recently-updated/changes.action?theme=social&amp;pageSize=5&amp;startIndex=0&amp;spaceKeys=PDA">
42+
</div>
43+
<div class="results-container">
44+
<ul class="update-groupings">
45+
<li class="first grouping">
46+
<div class="update-item-profile">
47+
<a class="confluence-userlink url fn" data-username="20200921007" href=""><img class="userLogo logo" src="images/icons/profilepics/default.png" alt="" title="20200921007"></a>
48+
</div>
49+
<ul class="update-items">
50+
<div><a class="confluence-userlink url fn" data-username="20200921007" href="/display/~20200921007">张三</a></div>
51+
<li class="update-item">
52+
<div class="update-item-icon">
53+
<span class="icon content-type-page"></span>
54+
</div>
55+
<div class="update-item-details">
56+
<span class="update-item-content">
57+
<a href="17338793.html" title="PDA">校验</a>
58+
</span>
59+
<span class="update-item-date">在六月 09, 2021创建</span>
60+
</div>
61+
</li>
62+
<li class="update-item">
63+
<div class="update-item-icon">
64+
<span class="icon content-type-page"></span>
65+
</div>
66+
<div class="update-item-details">
67+
<span class="update-item-content">
68+
<a href="17338790.html" title="PDA">获取</a>
69+
</span>
70+
<span class="update-item-date">在六月 09, 2021创建</span>
71+
</div>
72+
</li>
73+
</ul>
74+
</li>
75+
<li class=" grouping">
76+
<div class="update-item-profile">
77+
<a class="confluence-userlink url fn" data-username="lisi" href=""><img class="userLogo logo" src="images/icons/profilepics/default.png" alt="" title="lisi"></a>
78+
</div>
79+
<ul class="update-items">
80+
<div><a class="confluence-userlink url fn" data-username="lisi" href="/display/~lisi">李四</a></div>
81+
<li class="update-item">
82+
<div class="update-item-icon">
83+
<span class="icon content-type-page"></span>
84+
</div>
85+
<div class="update-item-details">
86+
<span class="update-item-content">
87+
<a href="8391329.html" title="PDA">详情接口</a>
88+
</span>
89+
<span class="update-item-date">在九月 01, 2020更新</span>
90+
<span class="update-item-changes"> <a class="changes-link" href="/pages/diffpagesbyversion.action?pageId=8391329&amp;selectedPageVersions=18&amp;selectedPageVersions=17">view change</a></span>
91+
</div>
92+
</li>
93+
</ul>
94+
</li>
95+
</ul>
96+
<div class="more-link-container">
97+
<a class="more-link" href="/plugins/recently-updated/changes.action?theme=social&amp;pageSize=5&amp;startHandle=com.atlassian.confluence.pages.Page-9015841&amp;spaceKeys=PDA&amp;contentType=page, comment, blogpost">显示更多</a>
98+
<img class="waiting-image" alt="Please wait" src="images/icons/wait.gif">
99+
</div>
100+
</div>
101+
</div>
102+
<p></p></div>
103+
</div>
104+
<p>Hello World!</p>
105+
</div>
106+
107+
</div>
108+
</div>
109+
<div id="footer" role="contentinfo">
110+
<section class="footer-body">
111+
<p>Document generated by Confluence on 七月 05, 2021 18:26</p>
112+
<div id="footer-logo"><a href="http://www.atlassian.com/">Atlassian</a></div>
113+
</section>
114+
</div>
115+
</div>
116+
</body>
117+
</html>

‎tests/data/confluence/recent-space-activity-demo.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
hello
2+
=====
3+
4+
5+
6+
Hello World!

0 commit comments

Comments
 (0)